aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs4
1 files changed, 3 insertions, 1 deletions
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
156 public virtual bool SendCollisions() 156 public virtual bool SendCollisions()
157 { 157 {
158 bool ret = true; 158 bool ret = true;
159 // If the 'no collision' call, force it to happen right now so quick collision_end
160 bool force = CollisionCollection.Count == 0;
159 161
160 // throttle the collisions to the number of milliseconds specified in the subscription 162 // throttle the collisions to the number of milliseconds specified in the subscription
161 if (PhysicsScene.SimulationNowTime >= NextCollisionOkTime) 163 if (force || (PhysicsScene.SimulationNowTime >= NextCollisionOkTime))
162 { 164 {
163 NextCollisionOkTime = PhysicsScene.SimulationNowTime + SubscribedEventsMs; 165 NextCollisionOkTime = PhysicsScene.SimulationNowTime + SubscribedEventsMs;
164 166