From 8ae8bec4d148ace42aa176f924399464d5bcf7eb Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Fri, 12 Sep 2008 22:39:17 +0000 Subject: Changed "show users" command to display only root agents, "show users full" to display root and child agents (mantis #2171). --- OpenSim/Framework/Console/ConsoleBase.cs | 2 +- OpenSim/Framework/Console/ConsoleCallbacksBase.cs | 2 +- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 10 +++++----- OpenSim/Region/Application/OpenSim.cs | 22 ++++++++++++++++------ OpenSim/Region/Environment/Scenes/Scene.cs | 6 +++--- OpenSim/TestSuite/BotManager.cs | 4 ++-- OpenSim/Tools/pCampBot/BotManager.cs | 4 ++-- 7 files changed, 30 insertions(+), 20 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 767740b..69c7bc1 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -372,7 +372,7 @@ namespace OpenSim.Framework.Console // Shows data about something public void ShowCommands(string ShowWhat) { - m_cmdParser.Show(ShowWhat); + m_cmdParser.Show(new string[] { ShowWhat }); } public void Prompt() diff --git a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs index 8505eea..d37c47a 100644 --- a/OpenSim/Framework/Console/ConsoleCallbacksBase.cs +++ b/OpenSim/Framework/Console/ConsoleCallbacksBase.cs @@ -30,6 +30,6 @@ namespace OpenSim.Framework.Console public interface conscmd_callback { void RunCmd(string cmd, string[] cmdparams); - void Show(string ShowWhat); + void Show(string[] showParams); } } diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 794dbd8..e149a35 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -254,7 +254,7 @@ namespace OpenSim.Framework.Servers case "show": if (cmdparams.Length > 0) { - Show(cmdparams[0]); + Show(cmdparams); } break; @@ -317,12 +317,12 @@ namespace OpenSim.Framework.Servers /// /// Outputs to the console information about the region /// - /// - /// What information to display (valid arguments are "uptime", "users") + /// + /// What information to display (valid arguments are "uptime", "users", ...) /// - public virtual void Show(string showWhat) + public virtual void Show(string[] showParams) { - switch (showWhat) + switch (showParams[0]) { case "info": Notice("Version: " + m_version); diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 43c1d26..4cf34bc 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -269,7 +269,8 @@ namespace OpenSim m_console.Notice("script - manually trigger scripts? or script commands?"); m_console.Notice("set-time [x] - set the current scene time phase"); m_console.Notice("show assets - show state of asset cache."); - m_console.Notice("show users - show info about connected users."); + m_console.Notice("show users - show info about connected users (only root agents)."); + m_console.Notice("show users full - show info about connected users (root and child agents)."); m_console.Notice("show modules - shows info about loaded modules."); m_console.Notice("show regions - show running region information."); m_console.Notice("config set section field value - set a config value"); @@ -634,7 +635,8 @@ namespace OpenSim m_console.Notice("script - manually trigger scripts? or script commands?"); m_console.Notice("set-time [x] - set the current scene time phase"); m_console.Notice("show assets - show state of asset cache."); - m_console.Notice("show users - show info about connected users."); + m_console.Notice("show users - show info about connected users (only root agents)."); + m_console.Notice("show users full - show info about connected users (root and child agents)."); m_console.Notice("show modules - shows info about loaded modules."); m_console.Notice("show regions - show running region information."); m_console.Notice("config set section field value - set a config value"); @@ -652,18 +654,26 @@ namespace OpenSim } // see BaseOpenSimServer - public override void Show(string ShowWhat) + public override void Show(string[] showParams) { - base.Show(ShowWhat); + base.Show(showParams); - switch (ShowWhat) + switch (showParams[0]) { case "assets": m_assetCache.ShowState(); break; case "users": - IList agents = m_sceneManager.GetCurrentScenePresences(); + IList agents; + if (showParams.Length > 1 && showParams[1] == "full") + { + agents = m_sceneManager.GetCurrentScenePresences(); + } + else + { + agents = m_sceneManager.GetCurrentSceneAvatars(); + } m_console.Notice(String.Format("\nAgents connected: {0}\n", agents.Count)); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index da76ab8..7116904 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -3468,10 +3468,10 @@ namespace OpenSim.Region.Environment.Scenes /// /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. /// - /// - public void Show(string showWhat) + /// What to show + public void Show(string[] showParams) { - switch (showWhat) + switch (showParams[0]) { case "users": m_log.Error("Current Region: " + RegionInfo.RegionName); diff --git a/OpenSim/TestSuite/BotManager.cs b/OpenSim/TestSuite/BotManager.cs index 7039b0f..8eb2027 100644 --- a/OpenSim/TestSuite/BotManager.cs +++ b/OpenSim/TestSuite/BotManager.cs @@ -212,8 +212,8 @@ namespace OpenSim.TestSuite /// /// Required method to implement the conscmd_callback interface /// - /// - public void Show(string ShowWhat) + /// What to show + public void Show(string[] showParams) { } } diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs index 8eb00c7..100f2d4 100644 --- a/OpenSim/Tools/pCampBot/BotManager.cs +++ b/OpenSim/Tools/pCampBot/BotManager.cs @@ -211,8 +211,8 @@ namespace pCampBot /// /// Required method to implement the conscmd_callback interface /// - /// - public void Show(string ShowWhat) + /// What to show + public void Show(string[] showParams) { } } -- cgit v1.1