aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorUbitUmarov2017-05-25 06:05:02 +0100
committerUbitUmarov2017-05-25 06:05:02 +0100
commit772c5b7db030eb95da8852d711323244cfa91ab4 (patch)
tree8cc90e4081377edf98804513d606ad217c9e6751 /OpenSim/Server/Base
parentUpdate macOS version of libode to 0.13.2. The library is build as a fat libra... (diff)
downloadopensim-SC-772c5b7db030eb95da8852d711323244cfa91ab4.zip
opensim-SC-772c5b7db030eb95da8852d711323244cfa91ab4.tar.gz
opensim-SC-772c5b7db030eb95da8852d711323244cfa91ab4.tar.bz2
opensim-SC-772c5b7db030eb95da8852d711323244cfa91ab4.tar.xz
move assetsconnector threads to whatchdog; Abort all alive threads known to watchdog before exit
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 2185727..176e876 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Server.Base
252 252
253 MemoryWatchdog.Enabled = false; 253 MemoryWatchdog.Enabled = false;
254 Watchdog.Enabled = false; 254 Watchdog.Enabled = false;
255 255 WorkManager.Stop();
256 RemovePIDFile(); 256 RemovePIDFile();
257 257
258 return 0; 258 return 0;