ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
This commit is contained in:
Melanie
2013-05-04 01:22:12 +01:00
parent 8305546a02 1ffa69f691
commit 3aa83738e2
41 changed files with 1439 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -504,9 +504,6 @@ namespace OpenSim
scene.SnmpService.LinkUp(scene);
}
scene.Start();
scene.StartScripts();
return clientServers;
}
@@ -835,6 +832,7 @@ namespace OpenSim
ShutdownClientServer(whichRegion);
IScene scene;
CreateRegion(whichRegion, true, out scene);
scene.Start();
}
# region Setup methods