Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

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
                         */
                     #endregion
 
-                    // If we're one region over +x y
+                    // If we're one region over +x y (i.e. root region is to the west)
                     //xxx
                     //xxy
                     //xxx
-
                     if (rootConn.PosX + rootConn.XEnd >= newConn.PosX && rootConn.PosY >= newConn.PosY)
                     {
                         connectedYN = DoWorkForOneRegionOverPlusXY(rootConn, newConn, scene);
                         break;
                     }
 
-                    // If we're one region over x +y
+                    // If we're one region over x +y (i.e. root region is to the south)
                     //xyx
                     //xxx
                     //xxx
@@ -436,7 +435,7 @@ namespace OpenSim.Region.RegionCombinerModule
                         break;
                     }
 
-                    // If we're one region over +x +y
+                    // If we're one region over +x +y (i.e. root region is to the south-west)
                     //xxy
                     //xxx
                     //xxx
@@ -646,7 +645,6 @@ namespace OpenSim.Region.RegionCombinerModule
             {
                 if (rootConn.RegionScene.EastBorders.Count == 1)// && conn.RegionScene.EastBorders.Count == 2)
                 {
-
                     rootConn.RegionScene.EastBorders[0].BorderLine.Z += (int)Constants.RegionSize;
 
                     lock (rootConn.RegionScene.NorthBorders)