diff options
author | UbitUmarov | 2017-05-25 06:05:02 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-25 06:05:02 +0100 |
commit | 772c5b7db030eb95da8852d711323244cfa91ab4 (patch) | |
tree | 8cc90e4081377edf98804513d606ad217c9e6751 /OpenSim/Region/ScriptEngine | |
parent | Update macOS version of libode to 0.13.2. The library is build as a fat libra... (diff) | |
download | opensim-SC_OLD-772c5b7db030eb95da8852d711323244cfa91ab4.zip opensim-SC_OLD-772c5b7db030eb95da8852d711323244cfa91ab4.tar.gz opensim-SC_OLD-772c5b7db030eb95da8852d711323244cfa91ab4.tar.bz2 opensim-SC_OLD-772c5b7db030eb95da8852d711323244cfa91ab4.tar.xz |
move assetsconnector threads to whatchdog; Abort all alive threads known to watchdog before exit
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 1 | ||||
-rwxr-xr-x | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 5f57f39..1688aa6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -231,6 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
231 | 231 | ||
232 | Watchdog.UpdateThread(); | 232 | Watchdog.UpdateThread(); |
233 | } | 233 | } |
234 | catch ( System.Threading.ThreadAbortException) { } | ||
234 | catch (Exception e) | 235 | catch (Exception e) |
235 | { | 236 | { |
236 | m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e); | 237 | m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e); |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 2e39033..c1abba2 100755 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1079,6 +1079,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1079 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name); | 1079 | "[XEngine]: Started {0} scripts in {1}", scriptsStarted, m_Scene.Name); |
1080 | } | 1080 | } |
1081 | } | 1081 | } |
1082 | catch (System.Threading.ThreadAbortException) { } | ||
1082 | catch (Exception e) | 1083 | catch (Exception e) |
1083 | { | 1084 | { |
1084 | m_log.Error( | 1085 | m_log.Error( |