Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

2026-08-10 11:33:28 +08:00 · 2009-09-26 07:49:04 -07:00
parent 5757afe766 a7f3d01f8a
commit 7253a9453e
15 changed files with 112 additions and 34 deletions
--- 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);