From e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 3 Feb 2018 19:34:17 +0000 Subject: just DIE damm thread (recent monos issue) --- OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs') 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); -- cgit v1.1