From 2bb513329ac98914ff13a2817aa83b60d85603d9 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Fri, 25 Sep 2009 16:06:04 -0400
Subject: * Does a full battery of tests to ensure that the object isn't an
 attachment before border crossing * Fixes 'Inconsistent Attachment State'
 when teleporting into another region besides the SW most region slot on a
 MegaRegion. * Fixes a host of other unintended attachment border cross edge
 cases that lead to Inconsistent attachment state.

---
 OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 1436912..181c5ae 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -79,12 +79,12 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             if (!enabledYN)
                 return;
-
+/* 
             // For testing on a single instance
             if (scene.RegionInfo.RegionLocX == 1004 && scene.RegionInfo.RegionLocY == 1000)
                 return;
-            //
-
+            // 
+*/
             lock (m_startingScenes)
                 m_startingScenes.Add(scene.RegionInfo.originRegionID, scene);
 
-- 
cgit v1.1