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/Region/Application | |
parent | correct method doc for llRot2Axis() (diff) | |
download | opensim-SC-0d2fd0d914581f755661455b8db2b9e399154632.zip opensim-SC-0d2fd0d914581f755661455b8db2b9e399154632.tar.gz opensim-SC-0d2fd0d914581f755661455b8db2b9e399154632.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index c3e7ec2..e451aa8 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -124,6 +124,7 @@ namespace OpenSim | |||
124 | workerThreads = workerThreadsMax; | 124 | workerThreads = workerThreadsMax; |
125 | m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads); | 125 | m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads); |
126 | } | 126 | } |
127 | |||
127 | // Increase the number of IOCP threads available. | 128 | // Increase the number of IOCP threads available. |
128 | // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) | 129 | // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17) |
129 | if (iocpThreads < iocpThreadsMin) | 130 | if (iocpThreads < iocpThreadsMin) |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 11dd052..9325b12 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -372,7 +372,7 @@ namespace OpenSim | |||
372 | "Unload a module", HandleModules); | 372 | "Unload a module", HandleModules); |
373 | } | 373 | } |
374 | 374 | ||
375 | public override void ShutdownSpecific() | 375 | protected override void ShutdownSpecific() |
376 | { | 376 | { |
377 | if (m_shutdownCommandsFile != String.Empty) | 377 | if (m_shutdownCommandsFile != String.Empty) |
378 | { | 378 | { |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f9e0cf1..7ca87a3 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -231,10 +231,7 @@ namespace OpenSim | |||
231 | } | 231 | } |
232 | 232 | ||
233 | if (m_console != null) | 233 | if (m_console != null) |
234 | { | ||
235 | StatsManager.RegisterConsoleCommands(m_console); | ||
236 | AddPluginCommands(m_console); | 234 | AddPluginCommands(m_console); |
237 | } | ||
238 | } | 235 | } |
239 | 236 | ||
240 | protected virtual void AddPluginCommands(ICommandConsole console) | 237 | protected virtual void AddPluginCommands(ICommandConsole console) |
@@ -880,7 +877,7 @@ namespace OpenSim | |||
880 | /// <summary> | 877 | /// <summary> |
881 | /// Performs any last-minute sanity checking and shuts down the region server | 878 | /// Performs any last-minute sanity checking and shuts down the region server |
882 | /// </summary> | 879 | /// </summary> |
883 | public override void ShutdownSpecific() | 880 | protected override void ShutdownSpecific() |
884 | { | 881 | { |
885 | if (proxyUrl.Length > 0) | 882 | if (proxyUrl.Length > 0) |
886 | { | 883 | { |
@@ -900,6 +897,8 @@ namespace OpenSim | |||
900 | { | 897 | { |
901 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); | 898 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); |
902 | } | 899 | } |
900 | |||
901 | base.ShutdownSpecific(); | ||
903 | } | 902 | } |
904 | 903 | ||
905 | /// <summary> | 904 | /// <summary> |