aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs5
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs5
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
115 base.ShutdownSpecific(); 115 base.ShutdownSpecific();
116 116
117 if (!SuppressExit) 117 if (!SuppressExit)
118 Environment.Exit(0); 118 System.Diagnostics.Process.GetCurrentProcess().Kill();
119//// Environment.Exit(0);
119 } 120 }
120 121
121 /// <summary> 122 /// <summary>
@@ -175,4 +176,4 @@ namespace OpenSim.Framework.Servers
175 } 176 }
176 } 177 }
177 } 178 }
178} \ No newline at end of file 179}
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
121 catch (Exception e) 121 catch (Exception e)
122 { 122 {
123 System.Console.WriteLine("Error reading from config source. {0}", e.Message); 123 System.Console.WriteLine("Error reading from config source. {0}", e.Message);
124 Environment.Exit(1); 124 System.Diagnostics.Process.GetCurrentProcess().Kill();
125///// Environment.Exit(1);
125 } 126 }
126 127
127 // Merge OpSys env vars 128 // Merge OpSys env vars
@@ -240,4 +241,4 @@ namespace OpenSim.Server.Base
240 { 241 {
241 } 242 }
242 } 243 }
243} \ No newline at end of file 244}