2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 828a852..5ce978e 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -115,7 +115,8 @@ namespace OpenSim.Framework.Servers
             base.ShutdownSpecific();
 
             if (!SuppressExit)
-                Environment.Exit(0);
+                System.Diagnostics.Process.GetCurrentProcess().Kill();
+////                Environment.Exit(0);
         }
         
         /// <summary>
@@ -175,4 +176,4 @@ namespace OpenSim.Framework.Servers
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 40cec08..076868d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -121,7 +121,8 @@ namespace OpenSim.Server.Base
             catch (Exception e)
             {
                 System.Console.WriteLine("Error reading from config source.  {0}", e.Message);
-                Environment.Exit(1);
+                System.Diagnostics.Process.GetCurrentProcess().Kill();
+/////                Environment.Exit(1);
             }
 
             // Merge OpSys env vars
@@ -240,4 +241,4 @@ namespace OpenSim.Server.Base
         {
         }
     }
-}
\ No newline at end of file
+}