OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed "show users" command to display only root agents, "show users full" to 

display root and child agents (mantis #2171).
0.6.0-stable
Homer Horwitz 2008-09-12 22:39:17 +00:00
parent 9cdd9e215c
commit 8ae8bec4d1
7 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -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()

2
OpenSim/Framework/Console/ConsoleCallbacksBase.cs
View File

@ -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);
}
}

10
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@ -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
/// <summary>
/// Outputs to the console information about the region
/// </summary>
/// <param name="showWhat">
/// What information to display (valid arguments are "uptime", "users")
/// <param name="showParams">
/// What information to display (valid arguments are "uptime", "users", ...)
/// </param>
public virtual void Show(string showWhat)
public virtual void Show(string[] showParams)
{
switch (showWhat)
switch (showParams[0])
{
case "info":
Notice("Version: " + m_version);

22
OpenSim/Region/Application/OpenSim.cs
View File

@ -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));

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -3468,10 +3468,10 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary>
/// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
/// </summary>
/// <param name="showWhat"></param>
public void Show(string showWhat)
/// <param name="showParams">What to show</param>
public void Show(string[] showParams)
{
switch (showWhat)
switch (showParams[0])
{
case "users":
m_log.Error("Current Region: " + RegionInfo.RegionName);

4
OpenSim/TestSuite/BotManager.cs
View File

@ -212,8 +212,8 @@ namespace OpenSim.TestSuite
/// <summary>
/// Required method to implement the conscmd_callback interface
/// </summary>
/// <param name="ShowWhat"></param>
public void Show(string ShowWhat)
/// <param name="showParams">What to show</param>
public void Show(string[] showParams)
{
}
}

4
OpenSim/Tools/pCampBot/BotManager.cs
View File

@ -211,8 +211,8 @@ namespace pCampBot
/// <summary>
/// Required method to implement the conscmd_callback interface
/// </summary>
/// <param name="ShowWhat"></param>
public void Show(string ShowWhat)
/// <param name="showParams">What to show</param>
public void Show(string[] showParams)
{
}
}