diff options
author | Justin Clark-Casey (justincc) | 2014-07-04 23:57:24 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-07-05 00:15:35 +0100 |
commit | 82a5d00bc847b4bf5e5ba7b8e47ee109929c63bf (patch) | |
tree | c80b5bc93666261afdadaa7a7dcef74f82df6ccd /OpenSim/Services/GridService | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-82a5d00bc847b4bf5e5ba7b8e47ee109929c63bf.zip opensim-SC_OLD-82a5d00bc847b4bf5e5ba7b8e47ee109929c63bf.tar.gz opensim-SC_OLD-82a5d00bc847b4bf5e5ba7b8e47ee109929c63bf.tar.bz2 opensim-SC_OLD-82a5d00bc847b4bf5e5ba7b8e47ee109929c63bf.tar.xz |
Adjust "show regions" and "show region" robust service console output to show size
"show regions" drops the owner id column but is till present in "show region"
"show regions" name column expanded to allow for longer hg regions (probably still too short, may eventually have to truncate rather than taking up huge screen space)
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r-- | OpenSim/Services/GridService/GridService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 36957a7..477f54b 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -620,7 +620,6 @@ namespace OpenSim.Services.GridService | |||
620 | OutputRegionsToConsoleSummary(regions); | 620 | OutputRegionsToConsoleSummary(regions); |
621 | } | 621 | } |
622 | 622 | ||
623 | |||
624 | private void HandleShowRegion(string module, string[] cmd) | 623 | private void HandleShowRegion(string module, string[] cmd) |
625 | { | 624 | { |
626 | if (cmd.Length != 4) | 625 | if (cmd.Length != 4) |
@@ -679,7 +678,8 @@ namespace OpenSim.Services.GridService | |||
679 | ConsoleDisplayList dispList = new ConsoleDisplayList(); | 678 | ConsoleDisplayList dispList = new ConsoleDisplayList(); |
680 | dispList.AddRow("Region Name", r.RegionName); | 679 | dispList.AddRow("Region Name", r.RegionName); |
681 | dispList.AddRow("Region ID", r.RegionID); | 680 | dispList.AddRow("Region ID", r.RegionID); |
682 | dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY)); | 681 | dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY)); |
682 | dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY)); | ||
683 | dispList.AddRow("URI", r.Data["serverURI"]); | 683 | dispList.AddRow("URI", r.Data["serverURI"]); |
684 | dispList.AddRow("Owner ID", r.Data["owner_uuid"]); | 684 | dispList.AddRow("Owner ID", r.Data["owner_uuid"]); |
685 | dispList.AddRow("Flags", flags); | 685 | dispList.AddRow("Flags", flags); |
@@ -696,10 +696,10 @@ namespace OpenSim.Services.GridService | |||
696 | private void OutputRegionsToConsoleSummary(List<RegionData> regions) | 696 | private void OutputRegionsToConsoleSummary(List<RegionData> regions) |
697 | { | 697 | { |
698 | ConsoleDisplayTable dispTable = new ConsoleDisplayTable(); | 698 | ConsoleDisplayTable dispTable = new ConsoleDisplayTable(); |
699 | dispTable.AddColumn("Name", 16); | 699 | dispTable.AddColumn("Name", 44); |
700 | dispTable.AddColumn("ID", 36); | 700 | dispTable.AddColumn("ID", 36); |
701 | dispTable.AddColumn("Position", 11); | 701 | dispTable.AddColumn("Position", 11); |
702 | dispTable.AddColumn("Owner ID", 36); | 702 | dispTable.AddColumn("Size", 11); |
703 | dispTable.AddColumn("Flags", 60); | 703 | dispTable.AddColumn("Flags", 60); |
704 | 704 | ||
705 | foreach (RegionData r in regions) | 705 | foreach (RegionData r in regions) |
@@ -709,7 +709,7 @@ namespace OpenSim.Services.GridService | |||
709 | r.RegionName, | 709 | r.RegionName, |
710 | r.RegionID.ToString(), | 710 | r.RegionID.ToString(), |
711 | string.Format("{0},{1}", r.coordX, r.coordY), | 711 | string.Format("{0},{1}", r.coordX, r.coordY), |
712 | r.Data["owner_uuid"].ToString(), | 712 | string.Format("{0}x{1}", r.sizeX, r.sizeY), |
713 | flags.ToString()); | 713 | flags.ToString()); |
714 | } | 714 | } |
715 | 715 | ||