diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 905540d..7127c73 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -415,18 +415,17 @@ namespace OpenSim.Region.RegionCombinerModule | |||
415 | */ | 415 | */ |
416 | #endregion | 416 | #endregion |
417 | 417 | ||
418 | // If we're one region over +x y | 418 | // If we're one region over +x y (i.e. root region is to the west) |
419 | //xxx | 419 | //xxx |
420 | //xxy | 420 | //xxy |
421 | //xxx | 421 | //xxx |
422 | |||
423 | if (rootConn.PosX + rootConn.XEnd >= newConn.PosX && rootConn.PosY >= newConn.PosY) | 422 | if (rootConn.PosX + rootConn.XEnd >= newConn.PosX && rootConn.PosY >= newConn.PosY) |
424 | { | 423 | { |
425 | connectedYN = DoWorkForOneRegionOverPlusXY(rootConn, newConn, scene); | 424 | connectedYN = DoWorkForOneRegionOverPlusXY(rootConn, newConn, scene); |
426 | break; | 425 | break; |
427 | } | 426 | } |
428 | 427 | ||
429 | // If we're one region over x +y | 428 | // If we're one region over x +y (i.e. root region is to the south) |
430 | //xyx | 429 | //xyx |
431 | //xxx | 430 | //xxx |
432 | //xxx | 431 | //xxx |
@@ -436,7 +435,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
436 | break; | 435 | break; |
437 | } | 436 | } |
438 | 437 | ||
439 | // If we're one region over +x +y | 438 | // If we're one region over +x +y (i.e. root region is to the south-west) |
440 | //xxy | 439 | //xxy |
441 | //xxx | 440 | //xxx |
442 | //xxx | 441 | //xxx |
@@ -646,7 +645,6 @@ namespace OpenSim.Region.RegionCombinerModule | |||
646 | { | 645 | { |
647 | if (rootConn.RegionScene.EastBorders.Count == 1)// && conn.RegionScene.EastBorders.Count == 2) | 646 | if (rootConn.RegionScene.EastBorders.Count == 1)// && conn.RegionScene.EastBorders.Count == 2) |
648 | { | 647 | { |
649 | |||
650 | rootConn.RegionScene.EastBorders[0].BorderLine.Z += (int)Constants.RegionSize; | 648 | rootConn.RegionScene.EastBorders[0].BorderLine.Z += (int)Constants.RegionSize; |
651 | 649 | ||
652 | lock (rootConn.RegionScene.NorthBorders) | 650 | lock (rootConn.RegionScene.NorthBorders) |