From f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 27 Sep 2012 08:23:29 -0700
Subject: BulletSim: Fix linkset crash. Caused by the different body and shape 
    pointers at runtime and at taint-time. Now passes the body into the    
 taint. Vehicles zero inertia when active to eliminate Bullet's contribution  
   to vehicle motion.

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

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index e8c628c..44a249c 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -544,12 +544,15 @@ public class BSScene : PhysicsScene, IPhysicsParameters
 
         // The above SendCollision's batch up the collisions on the objects.
         //      Now push the collisions into the simulator.
-        // If the object is done colliding, it will add itself to the ObjectsWithNoMoreCollisions list.
         if (ObjectsWithCollisions.Count > 0)
         {
             foreach (BSPhysObject bsp in ObjectsWithCollisions)
                 if (!m_avatars.Contains(bsp))   // don't call avatars twice
-                    bsp.SendCollisions();
+                    if (!bsp.SendCollisions())
+                    {
+                        // If the object is done colliding, see that it's removed from the colliding list
+                        ObjectsWithNoMoreCollisions.Add(bsp);
+                    }
         }
 
         // Objects that are done colliding are removed from the ObjectsWithCollisions list.
-- 
cgit v1.1