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()
---
 .../Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

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
                     {
-- 
cgit v1.1