From e1ac68315491a0962bd4d089f7190e1b82607f43 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 21 Apr 2013 15:59:39 -0700
Subject: BulletSim: fix crash when deleting llVolumeDetect enabled objects.
 Bullet's check for an object being linked into the world does not work for
 Bullet's ghost objects so BulletSim was deleting the object while it was
 still linked into the physical world structures.

---
 OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index bfa69b2..1976c42 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -162,11 +162,8 @@ public sealed class BSShapeCollection : IDisposable
             // If the caller needs to know the old body is going away, pass the event up.
             if (bodyCallback != null) bodyCallback(body);
 
-            if (PhysicsScene.PE.IsInWorld(PhysicsScene.World, body))
-            {
-                PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
-                if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,removingFromWorld. Body={1}", body.ID, body);
-            }
+            // Removing an object not in the world is a NOOP
+            PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
 
             // Zero any reference to the shape so it is not freed when the body is deleted.
             PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, null);
-- 
cgit v1.1