From 928733efc908e25ea460ca4724a8846a4fb71fa1 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 23 May 2017 03:26:32 +0100
Subject:  please DIE! PLEASE??

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 62cd543..99d94bb 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -108,12 +108,17 @@ namespace OpenSim.Framework.Servers
 
         protected override void ShutdownSpecific()
         {
-            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
 
-            RemovePIDFile();
 
             base.ShutdownSpecific();
 
+            MainServer.Stop();
+
+            Thread.Sleep(5000);
+
+            RemovePIDFile();
+            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
+
             if (!SuppressExit)
                 Environment.Exit(0);
         }
-- 
cgit v1.1


From f3eb73926e1602f855f2c7fceb040b07f7265f3b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 23 May 2017 04:05:31 +0100
Subject:  stop a few more threads on exit

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 99d94bb..7d21e00 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Framework.Servers
 
             Thread.Sleep(5000);
 
+            WorkManager.Stop();
+
             RemovePIDFile();
             m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
 
-- 
cgit v1.1