aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs26
1 files changed, 15 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index 38cae66..b213ed2 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -129,9 +129,21 @@ namespace OpenSim
129 { 129 {
130 RunCommandScript(m_shutdownCommandsFile); 130 RunCommandScript(m_shutdownCommandsFile);
131 } 131 }
132 InternalShutdown(); 132
133 m_console.Close(); 133 if (proxyUrl.Length > 0)
134 Environment.Exit(0); 134 {
135 Util.XmlRpcCommand(proxyUrl, "Stop");
136 }
137
138 m_log.Info("[SHUTDOWN]: Closing all threads");
139 m_log.Info("[SHUTDOWN]: Killing listener thread");
140 m_log.Info("[SHUTDOWN]: Killing clients");
141 // TODO: implement this
142 m_log.Info("[SHUTDOWN]: Closing console and terminating");
143
144 m_sceneManager.Close();
145
146 base.Shutdown();
135 } 147 }
136 148
137 private void RunAutoTimerScript(object sender, EventArgs e) 149 private void RunAutoTimerScript(object sender, EventArgs e)
@@ -259,7 +271,6 @@ namespace OpenSim
259 m_console.Notice("load-xml [filename] - load prims from XML"); 271 m_console.Notice("load-xml [filename] - load prims from XML");
260 m_console.Notice("load-xml2 [filename] - load prims from XML using version 2 format"); 272 m_console.Notice("load-xml2 [filename] - load prims from XML using version 2 format");
261 m_console.Notice("permissions [true/false] - turn on/off permissions on the scene"); 273 m_console.Notice("permissions [true/false] - turn on/off permissions on the scene");
262 m_console.Notice("quit - equivalent to shutdown.");
263 m_console.Notice("restart - disconnects all clients and restarts the sims in the instance."); 274 m_console.Notice("restart - disconnects all clients and restarts the sims in the instance.");
264 m_console.Notice("remove-region [name] - remove a region"); 275 m_console.Notice("remove-region [name] - remove a region");
265 m_console.Notice("save-xml [filename] - save prims to XML"); 276 m_console.Notice("save-xml [filename] - save prims to XML");
@@ -271,7 +282,6 @@ namespace OpenSim
271 m_console.Notice("show modules - shows info about loaded modules."); 282 m_console.Notice("show modules - shows info about loaded modules.");
272 m_console.Notice("show stats - statistical information for this server not displayed in the client"); 283 m_console.Notice("show stats - statistical information for this server not displayed in the client");
273 m_console.Notice("threads - list threads"); 284 m_console.Notice("threads - list threads");
274 m_console.Notice("shutdown - disconnect all clients and shutdown.");
275 m_console.Notice("config set section field value - set a config value"); 285 m_console.Notice("config set section field value - set a config value");
276 m_console.Notice("config get section field - get a config value"); 286 m_console.Notice("config get section field - get a config value");
277 m_console.Notice("config save - save OpenSim.ini"); 287 m_console.Notice("config save - save OpenSim.ini");
@@ -422,12 +432,6 @@ namespace OpenSim
422 } 432 }
423 break; 433 break;
424 434
425 case "exit":
426 case "quit":
427 case "shutdown":
428 Shutdown();
429 break;
430
431 case "restart": 435 case "restart":
432 m_sceneManager.RestartCurrentScene(); 436 m_sceneManager.RestartCurrentScene();
433 break; 437 break;