From 4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 May 2012 03:45:58 +0100
Subject: Make the megaregion total area given to the physics module accurate
 instead of over-inflated.

This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added.
An accurate extent will also be necessary for other purposes.
---
 OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/RegionCombinerModule')

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
                         ((conn.Y * (int)Constants.RegionSize)));
 
             Vector3 extents = Vector3.Zero;
-            extents.Y = regionConnections.YEnd + conn.YEnd;
-            extents.X = regionConnections.XEnd + conn.XEnd;
-            conn.UpdateExtents(extents);
+
+            // We do not want to inflate the extents for regions strictly to the NE of the root region, since this
+            // would double count regions strictly to the north and east that have already been added.
+//            extents.Y = regionConnections.YEnd + conn.YEnd;
+//            extents.X = regionConnections.XEnd + conn.XEnd;
+//            conn.UpdateExtents(extents);
+
+            extents.Y = conn.YEnd;
+            extents.X = conn.XEnd;
 
             scene.BordersLocked = true;
             conn.RegionScene.BordersLocked = true;
-- 
cgit v1.1