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

Make "show queues [full]" behave like "show users [full]" 

Now, "show queues" only shows root agents.  "show queues full" will show child agents as well
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2010-11-17 20:09:18 +00:00
parent c4f3175e17
commit af0deff7e9
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,16 +286,15 @@ namespace OpenSim
m_console.Commands.AddCommand("region", false, "show users", m_console.Commands.AddCommand("region", false, "show users",
"show users [full]", "show users [full]",
"Show user data", HandleShow); "Show user data for users currently on the region",
"Without the 'full' option, only users actually on the region are shown."
+ " With the 'full' option child agents of users in neighbouring regions are also shown.",
HandleShow);
m_console.Commands.AddCommand("region", false, "show connections", m_console.Commands.AddCommand("region", false, "show connections",
"show connections", "show connections",
"Show connection data", HandleShow); "Show connection data", HandleShow);
m_console.Commands.AddCommand("region", false, "show users full",
"show users full",
String.Empty, HandleShow);
m_console.Commands.AddCommand("region", false, "show modules", m_console.Commands.AddCommand("region", false, "show modules",
"show modules", "show modules",
"Show module data", HandleShow); "Show module data", HandleShow);
@ -305,8 +304,10 @@ namespace OpenSim
"Show region data", HandleShow); "Show region data", HandleShow);
m_console.Commands.AddCommand("region", false, "show queues", m_console.Commands.AddCommand("region", false, "show queues",
"show queues", "show queues [full]",
"Show queue data for each client", "Show queue data for each client",
"Without the 'full' option, only users actually on the region are shown."
+ " With the 'full' option child agents of users in neighbouring regions are also shown.",
HandleShow); HandleShow);
m_console.Commands.AddCommand("region", false, "show ratings", m_console.Commands.AddCommand("region", false, "show ratings",
@ -879,7 +880,7 @@ namespace OpenSim
{ {
agents = m_sceneManager.GetCurrentSceneAvatars(); agents = m_sceneManager.GetCurrentSceneAvatars();
} }
MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count)); MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
MainConsole.Instance.Output( MainConsole.Instance.Output(
@ -956,7 +957,7 @@ namespace OpenSim
break; break;
case "queues": case "queues":
Notice(GetQueuesReport()); Notice(GetQueuesReport(showParams));
break; break;
case "ratings": case "ratings":
@ -986,11 +987,17 @@ namespace OpenSim
} }
/// <summary> /// <summary>
/// print UDP Queue data for each client /// Generate UDP Queue data report for each client
/// </summary> /// </summary>
/// <param name="showParams"></param>
/// <returns></returns> /// <returns></returns>
private string GetQueuesReport() private string GetQueuesReport(string[] showParams)
{ {
bool showChildren = false;
if (showParams.Length > 1 && showParams[1] == "full")
showChildren = true;
StringBuilder report = new StringBuilder(); StringBuilder report = new StringBuilder();
int columnPadding = 2; int columnPadding = 2;
@ -1040,6 +1047,10 @@ namespace OpenSim
{ {
if (client is IStatsCollector) if (client is IStatsCollector)
{ {
bool isChild = scene.PresenceChildStatus(client.AgentId);
if (isChild && !showChildren)
return;
string name = client.Name; string name = client.Name;
string regionName = scene.RegionInfo.RegionName; string regionName = scene.RegionInfo.RegionName;
@ -1051,7 +1062,7 @@ namespace OpenSim
regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, ""); regionName.Length > maxRegionNameLength ? regionName.Substring(0, maxRegionNameLength) : regionName, "");
report.AppendFormat( report.AppendFormat(
"{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}", "{0,-" + maxTypeLength + "}{1,-" + columnPadding + "}",
scene.PresenceChildStatus(client.AgentId) ? "Cd" : "Rt", ""); isChild ? "Cd" : "Rt", "");
IStatsCollector stats = (IStatsCollector)client; IStatsCollector stats = (IStatsCollector)client;