diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index a7ebecc..906c1d4 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -373,17 +373,22 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
373 | int maxNameLength = 18; | 373 | int maxNameLength = 18; |
374 | int maxRegionNameLength = 14; | 374 | int maxRegionNameLength = 14; |
375 | int maxTypeLength = 4; | 375 | int maxTypeLength = 4; |
376 | int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; | 376 | |
377 | int totalInfoFieldsLength | ||
378 | = maxNameLength + columnPadding | ||
379 | + maxRegionNameLength + columnPadding | ||
380 | + maxTypeLength + columnPadding; | ||
377 | 381 | ||
378 | report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); | 382 | report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); |
379 | report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); | 383 | report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); |
380 | report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); | 384 | report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); |
381 | 385 | ||
382 | report.AppendFormat( | 386 | report.AppendFormat( |
383 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n", | 387 | "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7} {12,7}\n", |
388 | "Since", | ||
389 | "Pkts", | ||
384 | "Pkts", | 390 | "Pkts", |
385 | "Pkts", | 391 | "Pkts", |
386 | "Pkts", | ||
387 | "Bytes", | 392 | "Bytes", |
388 | "Q Pkts", | 393 | "Q Pkts", |
389 | "Q Pkts", | 394 | "Q Pkts", |
@@ -396,7 +401,8 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
396 | 401 | ||
397 | report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); | 402 | report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); |
398 | report.AppendFormat( | 403 | report.AppendFormat( |
399 | "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n", | 404 | "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7} {12,7}\n", |
405 | "Last In", | ||
400 | "In", | 406 | "In", |
401 | "Out", | 407 | "Out", |
402 | "Resent", | 408 | "Resent", |
@@ -417,22 +423,22 @@ namespace OpenSim.Region.CoreModules.UDP.Linden | |||
417 | scene.ForEachClient( | 423 | scene.ForEachClient( |
418 | delegate(IClientAPI client) | 424 | delegate(IClientAPI client) |
419 | { | 425 | { |
420 | if (client is IStatsCollector) | 426 | bool isChild = client.SceneAgent.IsChildAgent; |
421 | { | 427 | if (isChild && !showChildren) |
422 | bool isChild = client.SceneAgent.IsChildAgent; | 428 | return; |
423 | if (isChild && !showChildren) | 429 | |
424 | return; | 430 | string name = client.Name; |
425 | 431 | if (pname != "" && name != pname) | |
426 | string name = client.Name; | 432 | return; |
427 | if (pname != "" && name != pname) | ||
428 | return; | ||
429 | 433 | ||
430 | string regionName = scene.RegionInfo.RegionName; | 434 | string regionName = scene.RegionInfo.RegionName; |
431 | 435 | ||
432 | report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); | 436 | report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); |
433 | report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); | 437 | report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); |
434 | report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); | 438 | report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); |
435 | 439 | ||
440 | if (client is IStatsCollector) | ||
441 | { | ||
436 | IStatsCollector stats = (IStatsCollector)client; | 442 | IStatsCollector stats = (IStatsCollector)client; |
437 | 443 | ||
438 | report.AppendLine(stats.Report()); | 444 | report.AppendLine(stats.Report()); |