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

Rename IsRootRegion() to IsRootForMegaregion()

1 files changed, 2 insertions, 11 deletions

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);