XEngine: fix collisions, add event coalescing for collision events.

Fix a nasty concurrency issue that could cause a high event frequency
to start more than one thread pool job for a single script.

1 files changed, 4 insertions, 6 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 21e514b..79c4041 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2294,14 +2294,12 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (CollisionEventsThisFrame == null)
                 return;
 
-            //if (CollisionEventsThisFrame.m_objCollisionList == null)
-            //    return;
+            base.SendCollisionUpdate(CollisionEventsThisFrame);
 
-            if (CollisionEventsThisFrame.m_objCollisionList.Count > 0)
-            {
-                base.SendCollisionUpdate(CollisionEventsThisFrame);
+            if(CollisionEventsThisFrame.m_objCollisionList.Count == 0)
+                CollisionEventsThisFrame = null;
+            else
                 CollisionEventsThisFrame = new CollisionEventUpdate();
-            }
         }
 
         public override bool SubscribedEvents()