ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-05 02:48:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the megaregion total area given to the physics module accurate instead of over-inflated.

Browse Source 
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.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-05-19 03:45:58 +01:00
parent 3f2a727b6d
commit 4e5ac27928
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
View File

@@ -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;