ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-06-24 03:30:11 +01:00
parent ce6fbd9680 5a071dc798
commit e93853623b
3 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,18 +396,20 @@ namespace OpenSim
scene.SnmpService.BootInfo("Grid Registration done", scene);
}
scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
scene.EventManager.TriggerParcelPrimCountUpdate();
// We need to do this after we've initialized the
// scripting engines.
scene.CreateScriptInstances();
scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
scene.EventManager.TriggerParcelPrimCountUpdate();
if (scene.SnmpService != null)
{
scene.SnmpService.BootInfo("ScriptEngine started", scene);
}
=======
>>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs
m_sceneManager.Add(scene);
if (m_autoCreateClientStack)