aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-04-06 02:34:51 +0100
committerJustin Clark-Casey (justincc)2013-04-06 02:34:51 +0100
commit7f070236f72058ba22d017048b978adea380f0a1 (patch)
tree946880909bc158d7aaf1e2170da2db32cf3a0278 /OpenSim/Region/Framework
parentWhen rezzing a coalesced object, check adjust position of all components. (diff)
downloadopensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.zip
opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.gz
opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.bz2
opensim-SC_OLD-7f070236f72058ba22d017048b978adea380f0a1.tar.xz
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 911a3e4..f50d3cd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5361,12 +5361,12 @@ namespace OpenSim.Region.Framework.Scenes
5361 List<SceneObjectGroup> objects, 5361 List<SceneObjectGroup> objects,
5362 out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ) 5362 out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
5363 { 5363 {
5364 minX = 256; 5364 minX = float.MaxValue;
5365 maxX = -256; 5365 maxX = float.MinValue;
5366 minY = 256; 5366 minY = float.MaxValue;
5367 maxY = -256; 5367 maxY = float.MinValue;
5368 minZ = 8192; 5368 minZ = float.MaxValue;
5369 maxZ = -256; 5369 maxZ = float.MinValue;
5370 5370
5371 List<Vector3> offsets = new List<Vector3>(); 5371 List<Vector3> offsets = new List<Vector3>();
5372 5372