diff options
author | Justin Clark-Casey (justincc) | 2013-06-17 22:39:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-06-17 22:39:00 +0100 |
commit | 0d2fd0d914581f755661455b8db2b9e399154632 (patch) | |
tree | b3c8f5634d946d8e623f761eb7001f254d2af9be /OpenSim/Server/Base | |
parent | correct method doc for llRot2Axis() (diff) | |
download | opensim-SC_OLD-0d2fd0d914581f755661455b8db2b9e399154632.zip opensim-SC_OLD-0d2fd0d914581f755661455b8db2b9e399154632.tar.gz opensim-SC_OLD-0d2fd0d914581f755661455b8db2b9e399154632.tar.bz2 opensim-SC_OLD-0d2fd0d914581f755661455b8db2b9e399154632.tar.xz |
Make general server stats available on the robust console as well as the simulator console
This means the "show stats" command is now active on the robust console.
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index b13c87d..8243900 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -190,16 +190,7 @@ namespace OpenSim.Server.Base | |||
190 | } | 190 | } |
191 | 191 | ||
192 | RegisterCommonCommands(); | 192 | RegisterCommonCommands(); |
193 | 193 | RegisterCommonComponents(Config); | |
194 | // Register the quit command | ||
195 | // | ||
196 | MainConsole.Instance.Commands.AddCommand("General", false, "quit", | ||
197 | "quit", | ||
198 | "Quit the application", HandleQuit); | ||
199 | |||
200 | MainConsole.Instance.Commands.AddCommand("General", false, "shutdown", | ||
201 | "shutdown", | ||
202 | "Quit the application", HandleQuit); | ||
203 | 194 | ||
204 | // Allow derived classes to perform initialization that | 195 | // Allow derived classes to perform initialization that |
205 | // needs to be done after the console has opened | 196 | // needs to be done after the console has opened |
@@ -231,11 +222,12 @@ namespace OpenSim.Server.Base | |||
231 | return 0; | 222 | return 0; |
232 | } | 223 | } |
233 | 224 | ||
234 | protected virtual void HandleQuit(string module, string[] args) | 225 | protected override void ShutdownSpecific() |
235 | { | 226 | { |
236 | m_Running = false; | 227 | m_Running = false; |
237 | m_log.Info("[CONSOLE] Quitting"); | 228 | m_log.Info("[CONSOLE] Quitting"); |
238 | 229 | ||
230 | base.ShutdownSpecific(); | ||
239 | } | 231 | } |
240 | 232 | ||
241 | protected virtual void ReadConfig() | 233 | protected virtual void ReadConfig() |
@@ -246,4 +238,4 @@ namespace OpenSim.Server.Base | |||
246 | { | 238 | { |
247 | } | 239 | } |
248 | } | 240 | } |
249 | } | 241 | } \ No newline at end of file |