diff options
| author | Justin Clark-Casey (justincc) | 2012-05-19 03:45:58 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-19 03:45:58 +0100 |
| commit | 4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4 (patch) | |
| tree | 5c5637b4100b82fd59d2dc45c005f4e478c32c3c | |
| parent | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff) | |
| download | opensim-SC-4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4.zip opensim-SC-4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4.tar.gz opensim-SC-4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4.tar.bz2 opensim-SC-4e5ac27928f0bdcb5bd7c772dbdcdd049d6ab4c4.tar.xz | |
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.
| -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; |