aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorDiva Canto2010-06-25 05:15:54 -0700
committerDiva Canto2010-06-25 05:15:54 -0700
commit7488f612891e2bd34012ab181bedc832140a4d4d (patch)
tree5de32ecc585a8457af3a5dc89f1b010412196bb3 /OpenSim/Region/Application/OpenSimBase.cs
parentThis file wants to be committed. Line endings mess up. (diff)
parent* SimianAssetServiceConnector Delete() was expecting the wrong type of respon... (diff)
downloadopensim-SC_OLD-7488f612891e2bd34012ab181bedc832140a4d4d.zip
opensim-SC_OLD-7488f612891e2bd34012ab181bedc832140a4d4d.tar.gz
opensim-SC_OLD-7488f612891e2bd34012ab181bedc832140a4d4d.tar.bz2
opensim-SC_OLD-7488f612891e2bd34012ab181bedc832140a4d4d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 83be61e..f535fe8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -367,13 +367,13 @@ namespace OpenSim
367 Environment.Exit(1); 367 Environment.Exit(1);
368 } 368 }
369 369
370 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
371 scene.EventManager.TriggerParcelPrimCountUpdate();
372
370 // We need to do this after we've initialized the 373 // We need to do this after we've initialized the
371 // scripting engines. 374 // scripting engines.
372 scene.CreateScriptInstances(); 375 scene.CreateScriptInstances();
373 376
374 scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
375 scene.EventManager.TriggerParcelPrimCountUpdate();
376
377 m_sceneManager.Add(scene); 377 m_sceneManager.Add(scene);
378 378
379 if (m_autoCreateClientStack) 379 if (m_autoCreateClientStack)