Split GetAxisAlignedBoundingBox into two methods to allow calculation of

combined bounding boxes and offsets

1 files changed, 20 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ab7e3e9..0ad05e7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -652,10 +652,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// offsetHeight is the offset in the Z axis from the centre of the bounding box to the centre of the root prim
         /// </summary>
         /// <returns></returns>
-        public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight)
+        public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
-            float maxX = -256f, maxY = -256f, maxZ = -256f, minX = 256f, minY = 256f, minZ = 256f;
-            lock (m_parts)
+            maxX = -256f;
+            maxY = -256f;
+            maxZ = -256f;
+            minX = 256f;
+            minY = 256f;
+            minZ = 256f;
+
+            lock(m_parts);
             {
                 foreach (SceneObjectPart part in m_parts.Values)
                 {
@@ -888,7 +894,18 @@ namespace OpenSim.Region.Framework.Scenes
                         minZ = backBottomLeft.Z;
                 }
             }
+        }
+
+        public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight)
+        {
+            float minX;
+            float maxX;
+            float minY;
+            float maxY;
+            float minZ;
+            float maxZ;
 
+            GetAxisAlignedBoundingBoxRaw(out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
             Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ);
 
             offsetHeight = 0;