diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index da4cf3e..0d182fe 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -330,7 +330,6 @@ namespace OpenSim | |||
330 | inventoryService, backendService, backendService, m_dumpAssetsToFile); | 330 | inventoryService, backendService, backendService, m_dumpAssetsToFile); |
331 | m_commsManager = localComms; | 331 | m_commsManager = localComms; |
332 | 332 | ||
333 | // TODO No user stats collection yet for standalone | ||
334 | m_loginService = | 333 | m_loginService = |
335 | new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo, | 334 | new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo, |
336 | m_standaloneAuthenticate); | 335 | m_standaloneAuthenticate); |
@@ -718,7 +717,7 @@ namespace OpenSim | |||
718 | m_log.Error("show uptime - show simulator startup and uptime."); | 717 | m_log.Error("show uptime - show simulator startup and uptime."); |
719 | m_log.Error("show users - show info about connected users."); | 718 | m_log.Error("show users - show info about connected users."); |
720 | m_log.Error("show modules - shows info aboutloaded modules."); | 719 | m_log.Error("show modules - shows info aboutloaded modules."); |
721 | m_log.Error("stats - statistical information for this server not displayed in the client"); | 720 | m_log.Error("show stats - statistical information for this server not displayed in the client"); |
722 | m_log.Error("shutdown - disconnect all clients and shutdown."); | 721 | m_log.Error("shutdown - disconnect all clients and shutdown."); |
723 | m_log.Error("config set section field value - set a config value"); | 722 | m_log.Error("config set section field value - set a config value"); |
724 | m_log.Error("config get section field - get a config value"); | 723 | m_log.Error("config get section field - get a config value"); |
@@ -902,18 +901,6 @@ namespace OpenSim | |||
902 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); | 901 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); |
903 | } | 902 | } |
904 | break; | 903 | break; |
905 | |||
906 | case "stats": | ||
907 | if (StatsManager.SimExtraStats != null) | ||
908 | { | ||
909 | MainLog.Instance.Notice( | ||
910 | "STATS", Environment.NewLine + StatsManager.SimExtraStats.Report()); | ||
911 | } | ||
912 | else | ||
913 | { | ||
914 | MainLog.Instance.Notice("STATS", "Extra statistics collection has not been enabled"); | ||
915 | } | ||
916 | break; | ||
917 | 904 | ||
918 | case "config": | 905 | case "config": |
919 | string n = command.ToUpper(); | 906 | string n = command.ToUpper(); |
@@ -1073,6 +1060,18 @@ namespace OpenSim | |||
1073 | scene.RegionInfo.RegionLocY); | 1060 | scene.RegionInfo.RegionLocY); |
1074 | }); | 1061 | }); |
1075 | break; | 1062 | break; |
1063 | |||
1064 | case "stats": | ||
1065 | if (StatsManager.SimExtraStats != null) | ||
1066 | { | ||
1067 | m_log.Notice( | ||
1068 | "STATS", Environment.NewLine + StatsManager.SimExtraStats.Report()); | ||
1069 | } | ||
1070 | else | ||
1071 | { | ||
1072 | m_log.Notice("STATS", "Extra sim statistics collection has not been enabled"); | ||
1073 | } | ||
1074 | break; | ||
1076 | } | 1075 | } |
1077 | } | 1076 | } |
1078 | 1077 | ||