Merge branch 'master' into careminster-presence-refactor

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f053911..ae942f9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -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)