1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c7f0136..2834d94 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -136,12 +136,19 @@ 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);
+
+            WorkManager.Stop();
+
+            RemovePIDFile();
+            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
+
             if (!SuppressExit)
                 Environment.Exit(0);
         }