1 files changed, 17 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b876fc6..2a69ee1 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -423,6 +423,17 @@ namespace OpenSim.Region.Framework.Scenes
         private int landMS;
         private int spareMS;
 
+        // A temporary configuration flag to enable using FireAndForget to process
+        //   collisions from the physics engine. There is a problem with collisions
+        //   stopping sometimes and MB's suspicion is some race condition passing
+        //   collisions from the physics engine callback to the script engine.
+        //   This causes the collision events to be passed with a FireAndForget
+        //   call which should eliminate that linkage. Testers can turn this on
+        //   and see if collisions stop. If they don't, the problem is somewhere else.
+        //   This feature defaults to 'off' so, by default, the simulator operation
+        //   is not changed.
+        public bool ShouldUseFireAndForgetForCollisions = false;
+
         /// <summary>
         /// Tick at which the last frame was processed.
         /// </summary>
@@ -1075,8 +1086,14 @@ namespace OpenSim.Region.Framework.Scenes
                 m_update_presences        = startupConfig.GetInt("UpdateAgentsEveryNFrames",          m_update_presences);
                 m_update_terrain          = startupConfig.GetInt("UpdateTerrainEveryNFrames",         m_update_terrain);
                 m_update_temp_cleaning    = startupConfig.GetInt("UpdateTempCleaningEveryNSeconds",   m_update_temp_cleaning);
+
+                if (startupConfig.Contains("ShouldUseFireAndForgetForCollisions"))
+                {
+                    ShouldUseFireAndForgetForCollisions = startupConfig.GetBoolean("ShouldUseFireAndForgetForCollisions", false);
+                }
             }
 
+
             // FIXME: Ultimately this should be in a module.
             SendPeriodicAppearanceUpdates = false;