Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be more than one megaregion in a simulator, separated by water.

Rename IsRootRegion() to IsRootForMegaregion()

3 files changed, 5 insertions, 20 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 838b741..e54774b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (m_module != null && m_module.RegionCombinerModule != null)
                     {
                         IRegionCombinerModule mod = m_module.RegionCombinerModule;
-                        isMegaregion = mod.IsMegaregion && mod.IsRootRegion(m_scene.RegionInfo.RegionID);
+                        isMegaregion = mod.IsRootForMegaregion(m_scene.RegionInfo.RegionID);
                     }
                     else
                     {
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs
index 30e49b1..ca4ed5c 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs
@@ -38,14 +38,8 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IRegionCombinerModule
     {
         /// <summary>
-        /// Is this simulator hosting a megaregion?
+        /// Does the given id belong to the root region of a megaregion?
         /// </summary>
-        /// <value></value>
-        bool IsMegaregion { get; }
-
-        /// <summary>
-        /// Does the given id belong to the root region of the megaregion?
-        /// </summary>
-        bool IsRootRegion(UUID sceneId);
+        bool IsRootForMegaregion(UUID sceneId);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 3af5cc2..fadc30d 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -58,20 +58,11 @@ namespace OpenSim.Region.RegionCombinerModule
             get { return null; }
         }
 
-        public bool IsMegaregion
-        {
-            get
-            {
-                lock (m_startingScenes)
-                    return m_startingScenes.Count > 1;
-            }
-        }
-
         /// <summary>
         /// This holds the root regions for the megaregions.
         /// </summary>
         /// <remarks>
-        /// At this point we can actually assume there is only ever one megaregion (and hence only one entry here).
+        /// Usually there is only ever one megaregion (and hence only one entry here).
         /// </remarks>
         private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>();
 
@@ -122,7 +113,7 @@ namespace OpenSim.Region.RegionCombinerModule
             }
         }
 
-        public bool IsRootRegion(UUID sceneId)
+        public bool IsRootForMegaregion(UUID sceneId)
         {
             lock (m_regions)
                 return m_regions.ContainsKey(sceneId);