1 files changed, 2 insertions, 1 deletions

diff --git a/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs b/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
index a1238db..ddb3698 100644
--- a/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
+++ b/OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs
@@ -105,7 +105,8 @@ namespace OpenSim.Region.ScriptEngine.XMREngine
         {
             m_Exiting = true;
             WakeUpScriptThread();
-            thd.Join();
+            if(!thd.Join(250))
+                thd.Abort();
             lock (m_AllThreads)
                 m_AllThreads.Remove (thd);