From 3f2a727b6d6b0cf6c2e2c7ef11ebd0f3f1fefa83 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 May 2012 03:17:21 +0100
Subject: Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there
can be more than one megaregion in a simulator, separated by water.
Rename IsRootRegion() to IsRootForMegaregion()
---
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
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;
- }
- }
-
///
/// This holds the root regions for the megaregions.
///
///
- /// 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).
///
private Dictionary m_regions = new Dictionary();
@@ -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);
--
cgit v1.1