OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim/Region/ScriptEngine/XEngine
History
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
..
Resources Add the XML manifests needed to get the new style modules to load. 2009-04-15 23:59:15 +00:00
Tests * whoops, missing a / 2009-08-15 00:29:34 -04:00
EventManager.cs Remove localID from script controls data. It won't transfer to another 2010-07-11 13:09:11 +01:00
XEngine.cs Merge branch 'master' into danmerge 2010-11-30 17:36:36 -08:00
XWorkItem.cs Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00