diff options
| author | UbitUmarov | 2018-02-03 19:34:17 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-02-03 19:34:17 +0000 |
| commit | e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0 (patch) | |
| tree | ae2abbcd7f7d084b465df22ac6807c356296a918 /OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs | |
| parent | XMR: there is no need for a slice thread, it also causes timing issues; Below... (diff) | |
| download | opensim-SC-e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0.zip opensim-SC-e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0.tar.gz opensim-SC-e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0.tar.bz2 opensim-SC-e7e8a7ab4de8f29a3b646574033e4d8117cc7cc0.tar.xz | |
just DIE damm thread (recent monos issue)
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XMREngine/XMRScriptThread.cs | 3 |
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 | |||
| 105 | { | 105 | { |
| 106 | m_Exiting = true; | 106 | m_Exiting = true; |
| 107 | WakeUpScriptThread(); | 107 | WakeUpScriptThread(); |
| 108 | thd.Join(); | 108 | if(!thd.Join(250)) |
| 109 | thd.Abort(); | ||
| 109 | lock (m_AllThreads) | 110 | lock (m_AllThreads) |
| 110 | m_AllThreads.Remove (thd); | 111 | m_AllThreads.Remove (thd); |
| 111 | 112 | ||