admin/opensim
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim synced 2026-08-17 10:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,331 Commits 112 Branches 81 Tags
b76c233db3bdb4b71fedcfbf05ab408984577b59
Commit Graph
3 Commits
Author SHA1 Message Date
Dan Lake 681190f682 Merge branch 'master' into danmerge 
Conflicts:
	.nant/local.include
	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	bin/config-include/SimianGrid.ini
	prebuild.xml
 2010-11-30 17:36:36 -08:00
hliu19 a9608ba49a Fixed an unwanted warning that a point in space is not covered by any script engine, 
when there is no remote script engine running but that the main Scene is running a
    script engine locally.

    Fixed BroadcastToCM in RegionSyncServer.cs.
 2010-10-05 11:27:36 -07:00
Dan Lake 32b9a8d78d Added missing files to git 2010-09-27 16:00:29 -07:00