aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorUbitUmarov2017-05-25 06:05:02 +0100
committerUbitUmarov2017-05-25 06:05:02 +0100
commit772c5b7db030eb95da8852d711323244cfa91ab4 (patch)
tree8cc90e4081377edf98804513d606ad217c9e6751 /OpenSim/Framework/Servers
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/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index bc68681..81dd357 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -119,9 +119,10 @@ namespace OpenSim.Framework.Servers
119 119
120 Thread.Sleep(1000); 120 Thread.Sleep(1000);
121 RemovePIDFile(); 121 RemovePIDFile();
122
122 m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); 123 m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
123 124
124 if (!SuppressExit) 125 if (!SuppressExit)
125 Environment.Exit(0); 126 Environment.Exit(0);
126 } 127 }
127 128