diff options
author | Melanie | 2010-07-17 07:19:58 +0100 |
---|---|---|
committer | Melanie | 2010-07-17 07:19:58 +0100 |
commit | 373ac901560b3aaa4b531512152da9206bf89dcf (patch) | |
tree | 087041eb92247366f982e119c0d48bcca1afdf42 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Stop occasional permanently high 100% utilization when the server is started ... (diff) | |
download | opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.zip opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.tar.gz opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.tar.bz2 opensim-SC-373ac901560b3aaa4b531512152da9206bf89dcf.tar.xz |
Allow Megaregions to start properly after an unclean shutdown
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7089368..62ee574 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -145,6 +145,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
145 | 145 | ||
146 | protected SceneCommunicationService m_sceneGridService; | 146 | protected SceneCommunicationService m_sceneGridService; |
147 | public bool LoginsDisabled = true; | 147 | public bool LoginsDisabled = true; |
148 | public bool LoadingPrims = false; | ||
148 | 149 | ||
149 | public new float TimeDilation | 150 | public new float TimeDilation |
150 | { | 151 | { |
@@ -1650,6 +1651,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1650 | /// </summary> | 1651 | /// </summary> |
1651 | public virtual void LoadPrimsFromStorage(UUID regionID) | 1652 | public virtual void LoadPrimsFromStorage(UUID regionID) |
1652 | { | 1653 | { |
1654 | LoadingPrims = true; | ||
1653 | m_log.Info("[SCENE]: Loading objects from datastore"); | 1655 | m_log.Info("[SCENE]: Loading objects from datastore"); |
1654 | 1656 | ||
1655 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); | 1657 | List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID); |
@@ -1673,6 +1675,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1673 | } | 1675 | } |
1674 | 1676 | ||
1675 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); | 1677 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); |
1678 | LoadingPrims = false; | ||
1676 | } | 1679 | } |
1677 | 1680 | ||
1678 | 1681 | ||