aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-01-24 19:41:41 +0000
committerJustin Clark-Casey (justincc)2014-01-24 19:41:41 +0000
commit0eda7dd1c7f44010a8c602a321855c2421860de5 (patch)
tree31cc6285824e84ea3413d8f14e865db4d4ecc269 /OpenSim
parentMerge branch 'justincc-master' (diff)
parentminor: remove long unused state queue from "show queues" console reports (diff)
downloadopensim-SC-0eda7dd1c7f44010a8c602a321855c2421860de5.zip
opensim-SC-0eda7dd1c7f44010a8c602a321855c2421860de5.tar.gz
opensim-SC-0eda7dd1c7f44010a8c602a321855c2421860de5.tar.bz2
opensim-SC-0eda7dd1c7f44010a8c602a321855c2421860de5.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs40
1 files changed, 19 insertions, 21 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 1eb0a6b..ec18db0 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
304 private string GetImageQueuesReport(string[] showParams) 304 private string GetImageQueuesReport(string[] showParams)
305 { 305 {
306 if (showParams.Length < 5 || showParams.Length > 6) 306 if (showParams.Length < 5 || showParams.Length > 6)
307 return "Usage: image queues show <first-name> <last-name> [full]"; 307 return "Usage: show image queues <first-name> <last-name> [full]";
308 308
309 string firstName = showParams[3]; 309 string firstName = showParams[3];
310 string lastName = showParams[4]; 310 string lastName = showParams[4];
@@ -395,7 +395,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
395 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); 395 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
396 396
397 report.AppendFormat( 397 report.AppendFormat(
398 "{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", 398 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
399 "Since", 399 "Since",
400 "Pkts", 400 "Pkts",
401 "Pkts", 401 "Pkts",
@@ -407,12 +407,11 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
407 "Q Pkts", 407 "Q Pkts",
408 "Q Pkts", 408 "Q Pkts",
409 "Q Pkts", 409 "Q Pkts",
410 "Q Pkts",
411 "Q Pkts"); 410 "Q Pkts");
412 411
413 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); 412 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
414 report.AppendFormat( 413 report.AppendFormat(
415 "{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", 414 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
416 "Last In", 415 "Last In",
417 "In", 416 "In",
418 "Out", 417 "Out",
@@ -424,8 +423,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
424 "Cloud", 423 "Cloud",
425 "Task", 424 "Task",
426 "Texture", 425 "Texture",
427 "Asset", 426 "Asset");
428 "State");
429 427
430 lock (m_scenes) 428 lock (m_scenes)
431 { 429 {
@@ -434,24 +432,24 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
434 scene.ForEachClient( 432 scene.ForEachClient(
435 delegate(IClientAPI client) 433 delegate(IClientAPI client)
436 { 434 {
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) 435 if (client is IStatsCollector)
452 { 436 {
453 IStatsCollector stats = (IStatsCollector)client; 437
438 bool isChild = client.SceneAgent.IsChildAgent;
439 if (isChild && !showChildren)
440 return;
454 441
442 string name = client.Name;
443 if (pname != "" && name != pname)
444 return;
445
446 string regionName = scene.RegionInfo.RegionName;
447
448 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
449 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
450 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
451
452 IStatsCollector stats = (IStatsCollector)client;
455 report.AppendLine(stats.Report()); 453 report.AppendLine(stats.Report());
456 } 454 }
457 }); 455 });