1 files changed, 25 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 035e6f8..c525227 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -495,6 +495,29 @@ namespace OpenSim.Region.CoreModules.World.Land
             
         }
         
+        public void UnCombineRegion(RegionData rdata)
+        {
+            lock (m_regions)
+            {
+                if (m_regions.ContainsKey(rdata.RegionId))
+                {
+                    // uncombine root region and virtual regions
+                }
+                else
+                {
+                    foreach (RegionConnections r in m_regions.Values)
+                    {
+                        foreach (RegionData rd in r.ConnectedRegions)
+                        {
+                            if (rd.RegionId == rdata.RegionId)
+                            {
+                                // uncombine virtual region
+                            }
+                        }
+                    }
+                }
+            }
+        }
         // Create a set of infinite borders around the whole aabb of the combined island.
         private void AdjustLargeRegionBounds()
         {
@@ -635,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
     public class LargeLandChannel : ILandChannel
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // private static readonly ILog m_log =
+        //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private RegionData RegData;
         private ILandChannel RootRegionLandChannel;
         private readonly List<RegionData> RegionConnections;