BulletSim: properly free references to simple convex hull shapes. Didn't

loose memory since shapes are shared but did mess up usage accounting.

1 files changed, 37 insertions, 8 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index 3e4ee5a..9d47657 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -117,11 +117,11 @@ public abstract class BSShape
         StringBuilder buff = new StringBuilder();
         if (physShapeInfo == null)
         {
-            buff.Append(",noPhys");
+            buff.Append("<noPhys");
         }
         else
         {
-            buff.Append(",phy=");
+            buff.Append("<phy=");
             buff.Append(physShapeInfo.ToString());
         }
         buff.Append(",c=");
@@ -808,17 +808,25 @@ public class BSShapeCompound : BSShape
             }
             else
             {
-                if (physicsScene.PE.IsCompound(pShape))
+                BSShapeConvexHull chullDesc;
+                if (BSShapeConvexHull.TryGetHullByPtr(pShape, out chullDesc))
                 {
-                    BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
-                    recursiveCompound.Dereference(physicsScene);
+                    chullDesc.Dereference(physicsScene);
                 }
                 else
                 {
-                    if (physicsScene.PE.IsNativeShape(pShape))
+                    if (physicsScene.PE.IsCompound(pShape))
                     {
-                        BSShapeNative nativeShape = new BSShapeNative(pShape);
-                        nativeShape.Dereference(physicsScene);
+                        BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+                        recursiveCompound.Dereference(physicsScene);
+                    }
+                    else
+                    {
+                        if (physicsScene.PE.IsNativeShape(pShape))
+                        {
+                            BSShapeNative nativeShape = new BSShapeNative(pShape);
+                            nativeShape.Dereference(physicsScene);
+                        }
                     }
                 }
             }
@@ -898,6 +906,27 @@ public class BSShapeConvexHull : BSShape
             // TODO: schedule aging and destruction of unused meshes.
         }
     }
+    // Loop through all the known hulls and return the description based on the physical address.
+    public static bool TryGetHullByPtr(BulletShape pShape, out BSShapeConvexHull outHull)
+    {
+        bool ret = false;
+        BSShapeConvexHull foundDesc = null;
+        lock (ConvexHulls)
+        {
+            foreach (BSShapeConvexHull sh in ConvexHulls.Values)
+            {
+                if (sh.physShapeInfo.ReferenceSame(pShape))
+                {
+                    foundDesc = sh;
+                    ret = true;
+                    break;
+                }
+
+            }
+        }
+        outHull = foundDesc;
+        return ret;
+    }
 }
 
 // ============================================================================================================