From f422b9b388fe67c61e610c79efabd5e07512884b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 19 Oct 2012 10:48:45 -0700
Subject: BulletSim: reorder avatar collision checking to eliminate double
 collision_end. Various tweekings to avatar shape/mass/inertia/etc. Remove
 change from avatar radius to diameter. But still the avatar sinks.
 Collision_end now happens immediately rather than at the next subscription
 time.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 4 +++-
 1 file changed, 3 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 b8ef338..202052d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -156,9 +156,11 @@ public abstract class BSPhysObject : PhysicsActor
     public virtual bool SendCollisions()
     {
         bool ret = true;
+        // If the 'no collision' call, force it to happen right now so quick collision_end
+        bool force = CollisionCollection.Count == 0;
 
         // throttle the collisions to the number of milliseconds specified in the subscription
-        if (PhysicsScene.SimulationNowTime >= NextCollisionOkTime)
+        if (force || (PhysicsScene.SimulationNowTime >= NextCollisionOkTime))
         {
             NextCollisionOkTime = PhysicsScene.SimulationNowTime + SubscribedEventsMs;
 
-- 
cgit v1.1