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, 14 insertions, 11 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 22abd79..9ed2fbb 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -198,10 +198,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 det.Add(d);
             }
 
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
-                    "collision_start",
-                    new Object[] { new LSL_Types.LSLInteger(1) },
-                    det.ToArray()));
+            if (det.Count > 0)
+                myScriptEngine.PostObjectEvent(localID, new EventParams(
+                        "collision_start",
+                        new Object[] { new LSL_Types.LSLInteger(det.Count) },
+                        det.ToArray()));
         }
 
         public void collision(uint localID, ColliderArgs col)
@@ -217,9 +218,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 det.Add(d);
             }
 
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
-                    "collision", new Object[] { new LSL_Types.LSLInteger(1) },
-                    det.ToArray()));
+            if (det.Count > 0)
+                myScriptEngine.PostObjectEvent(localID, new EventParams(
+                        "collision", new Object[] { new LSL_Types.LSLInteger(det.Count) },
+                        det.ToArray()));
         }
 
         public void collision_end(uint localID, ColliderArgs col)
@@ -235,10 +237,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 det.Add(d);
             }
 
-            myScriptEngine.PostObjectEvent(localID, new EventParams(
-                    "collision_end",
-                    new Object[] { new LSL_Types.LSLInteger(1) },
-                    det.ToArray()));
+            if (det.Count > 0)
+                myScriptEngine.PostObjectEvent(localID, new EventParams(
+                        "collision_end",
+                        new Object[] { new LSL_Types.LSLInteger(det.Count) },
+                        det.ToArray()));
         }
 
         public void land_collision_start(uint localID, UUID itemID)