OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Rename IsRootRegion() to IsRootForMegaregion()
0.7.4.1
Justin Clark-Casey (justincc) 2012-05-19 03:17:21 +01:00
parent 26dfcf5395
commit 3f2a727b6d
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (m_module != null && m_module.RegionCombinerModule != null) if (m_module != null && m_module.RegionCombinerModule != null)
{ {
IRegionCombinerModule mod = m_module.RegionCombinerModule; IRegionCombinerModule mod = m_module.RegionCombinerModule;
isMegaregion = mod.IsMegaregion && mod.IsRootRegion(m_scene.RegionInfo.RegionID); isMegaregion = mod.IsRootForMegaregion(m_scene.RegionInfo.RegionID);
} }
else else
{ {

10
OpenSim/Region/Framework/Interfaces/IRegionCombinerModule.cs
View File

@ -38,14 +38,8 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IRegionCombinerModule public interface IRegionCombinerModule
{ {
/// <summary> /// <summary>
/// Is this simulator hosting a megaregion? /// Does the given id belong to the root region of a megaregion?
/// </summary> /// </summary>
/// <value></value> bool IsRootForMegaregion(UUID sceneId);
bool IsMegaregion { get; }
/// <summary>
/// Does the given id belong to the root region of the megaregion?
/// </summary>
bool IsRootRegion(UUID sceneId);
} }
} }

13
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@ -58,20 +58,11 @@ namespace OpenSim.Region.RegionCombinerModule
get { return null; } get { return null; }
} }
public bool IsMegaregion
{
get
{
lock (m_startingScenes)
return m_startingScenes.Count > 1;
}
}
/// <summary> /// <summary>
/// This holds the root regions for the megaregions. /// This holds the root regions for the megaregions.
/// </summary> /// </summary>
/// <remarks> /// <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> /// </remarks>
private Dictionary<UUID, RegionConnections> m_regions = new Dictionary<UUID, RegionConnections>(); 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) lock (m_regions)
return m_regions.ContainsKey(sceneId); return m_regions.ContainsKey(sceneId);