move assetsconnector threads to whatchdog; Abort all alive threads known to watchdog before exit

2026-07-31 22:05:36 +08:00 · 2017-05-25 06:05:02 +01:00
parent 0d31898fd6
commit 772c5b7db0
6 changed files with 30 additions and 2 deletions
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1079,6 +1079,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                                        "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name);
                        }
                    }
+                    catch (System.Threading.ThreadAbortException) { }
                    catch (Exception e)
                    {
                        m_log.Error(