diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index fadc30d..a2050b2 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -595,9 +595,15 @@ namespace OpenSim.Region.RegionCombinerModule | |||
595 | ((conn.Y * (int)Constants.RegionSize))); | 595 | ((conn.Y * (int)Constants.RegionSize))); |
596 | 596 | ||
597 | Vector3 extents = Vector3.Zero; | 597 | Vector3 extents = Vector3.Zero; |
598 | extents.Y = regionConnections.YEnd + conn.YEnd; | 598 | |
599 | extents.X = regionConnections.XEnd + conn.XEnd; | 599 | // We do not want to inflate the extents for regions strictly to the NE of the root region, since this |
600 | conn.UpdateExtents(extents); | 600 | // would double count regions strictly to the north and east that have already been added. |
601 | // extents.Y = regionConnections.YEnd + conn.YEnd; | ||
602 | // extents.X = regionConnections.XEnd + conn.XEnd; | ||
603 | // conn.UpdateExtents(extents); | ||
604 | |||
605 | extents.Y = conn.YEnd; | ||
606 | extents.X = conn.XEnd; | ||
601 | 607 | ||
602 | scene.BordersLocked = true; | 608 | scene.BordersLocked = true; |
603 | conn.RegionScene.BordersLocked = true; | 609 | conn.RegionScene.BordersLocked = true; |