diff options
author | Justin Clark-Casey (justincc) | 2014-01-24 19:31:31 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-01-24 19:42:44 +0000 |
commit | d1f1642e1aaf7afe53562cb3d4424b683190ecd4 (patch) | |
tree | 1636769f95e8965974c1bf68e08f38531c911b25 /OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |
parent | Merge branch '0.7.6-extended' into 0.7.6-post-fixes (diff) | |
download | opensim-SC_OLD-d1f1642e1aaf7afe53562cb3d4424b683190ecd4.zip opensim-SC_OLD-d1f1642e1aaf7afe53562cb3d4424b683190ecd4.tar.gz opensim-SC_OLD-d1f1642e1aaf7afe53562cb3d4424b683190ecd4.tar.bz2 opensim-SC_OLD-d1f1642e1aaf7afe53562cb3d4424b683190ecd4.tar.xz |
Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) from the "show queues" console report to stop screwing up formatting.
"show pquques" already did this
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index 1eb0a6b..3bf5585 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -434,24 +434,24 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden | |||
434 | scene.ForEachClient( | 434 | scene.ForEachClient( |
435 | delegate(IClientAPI client) | 435 | delegate(IClientAPI client) |
436 | { | 436 | { |
437 | bool isChild = client.SceneAgent.IsChildAgent; | ||
438 | if (isChild && !showChildren) | ||
439 | return; | ||
440 | |||
441 | string name = client.Name; | ||
442 | if (pname != "" && name != pname) | ||
443 | return; | ||
444 | |||
445 | string regionName = scene.RegionInfo.RegionName; | ||
446 | |||
447 | report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); | ||
448 | report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); | ||
449 | report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); | ||
450 | |||
451 | if (client is IStatsCollector) | 437 | if (client is IStatsCollector) |
452 | { | 438 | { |
453 | IStatsCollector stats = (IStatsCollector)client; | 439 | |
440 | bool isChild = client.SceneAgent.IsChildAgent; | ||
441 | if (isChild && !showChildren) | ||
442 | return; | ||
454 | 443 | ||
444 | string name = client.Name; | ||
445 | if (pname != "" && name != pname) | ||
446 | return; | ||
447 | |||
448 | string regionName = scene.RegionInfo.RegionName; | ||
449 | |||
450 | report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); | ||
451 | report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); | ||
452 | report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); | ||
453 | |||
454 | IStatsCollector stats = (IStatsCollector)client; | ||
455 | report.AppendLine(stats.Report()); | 455 | report.AppendLine(stats.Report()); |
456 | } | 456 | } |
457 | }); | 457 | }); |