diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 1a9131e..5095037 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1118,7 +1118,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1118 | } | 1118 | } |
1119 | 1119 | ||
1120 | instance.ClearQueue(); | 1120 | instance.ClearQueue(); |
1121 | instance.Stop(0); | 1121 | |
1122 | // Give the script some time to finish processing its last event. Simply aborting the script thread can | ||
1123 | // cause issues on mono 2.6, 2.10 and possibly later where locks are not released properly on abort. | ||
1124 | instance.Stop(1000); | ||
1125 | |||
1122 | // bool objectRemoved = false; | 1126 | // bool objectRemoved = false; |
1123 | 1127 | ||
1124 | lock (m_PrimObjects) | 1128 | lock (m_PrimObjects) |