diff options
author | Melanie | 2010-06-24 03:24:38 +0100 |
---|---|---|
committer | Melanie | 2010-06-24 03:24:38 +0100 |
commit | 5a071dc7986c5e262d9e9513b07fc59797724e55 (patch) | |
tree | 8d4666bf5bcbe939e6465eec5e29c0178352a487 | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-5a071dc7986c5e262d9e9513b07fc59797724e55.zip opensim-SC-5a071dc7986c5e262d9e9513b07fc59797724e55.tar.gz opensim-SC-5a071dc7986c5e262d9e9513b07fc59797724e55.tar.bz2 opensim-SC-5a071dc7986c5e262d9e9513b07fc59797724e55.tar.xz |
Move loading of parcels to before script start. Scripts using parcel functions
can fail if no land is loaded
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 |
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) |