Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 221eb47..8af7514 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -145,6 +145,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected SceneCommunicationService m_sceneGridService;
         public bool LoginsDisabled = true;
+        public bool LoadingPrims = false;
+        public bool CombineRegions = false;
 
         public new float TimeDilation
         {
@@ -655,6 +657,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
+                CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
 
                 IConfig interest_management_config = m_config.Configs["InterestManagement"];
                 if (interest_management_config != null)
@@ -1691,6 +1694,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public virtual void LoadPrimsFromStorage(UUID regionID)
         {
+            LoadingPrims = true;
             m_log.Info("[SCENE]: Loading objects from datastore");
 
             List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(regionID);
@@ -1714,6 +1718,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
+            LoadingPrims = false;
         }