From 9df85eadf4b3719a898fda8769313ae023962c25 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 10 Dec 2012 15:35:53 -0800
Subject: BulletSim: Fix crash on the destruction of physical linksets. While
 fixing the above, add methods to physical body and shape pointer wrapper so
 routines won't have to know that IntPtr.Zero means no physical instance. Fix
 problem with physical linksets failing after a few sits and unsits by
 properly restoring child prom positions for compound linksets after multiple
 selection and deselections.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index b05d4ee..d2fc15c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -75,6 +75,7 @@ public abstract class BSPhysObject : PhysicsActor
     public string TypeName { get; protected set; }
 
     public BSLinkset Linkset { get; set; }
+    public BSLinksetInfo LinksetInfo { get; set; }
 
     // Return the object mass without calculating it or having side effects
     public abstract float RawMass { get; }
@@ -253,7 +254,9 @@ public abstract class BSPhysObject : PhysicsActor
         SubscribedEventsMs = 0;
         PhysicsScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
         {
-            CurrentCollisionFlags = BulletSimAPI.RemoveFromCollisionFlags2(PhysBody.ptr, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+            // Make sure there is a body there because sometimes destruction happens in an un-ideal order.
+            if (PhysBody.HasPhysicalBody)
+                CurrentCollisionFlags = BulletSimAPI.RemoveFromCollisionFlags2(PhysBody.ptr, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
         });
     }
     // Return 'true' if the simulator wants collision events
-- 
cgit v1.1