From eb5ec4a78698a3b1fd6d581c800ac985d5d946fa Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 10 Jul 2012 21:42:51 +0100
Subject: If a script is being stopped manually, then give the scriptpool
 thread 1 second to finish normally before forcibly aborting.

This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks.
This very short grace period is identical to the existing behaviour when a script is removed from the scene.
---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7f3bd76..efcae94 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1574,7 +1574,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             IScriptInstance instance = GetInstance(itemID);
             if (instance != null)
-                instance.Stop(0);
+            {
+                // Give the script some time to finish processing its last event.  Simply aborting the script thread can
+                // cause issues on mono 2.6, 2.10 and possibly later where locks are not released properly on abort.
+                instance.Stop(1000);
+            }
         }
 
         public DetectParams GetDetectParams(UUID itemID, int idx)
-- 
cgit v1.1