aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs10
-rw-r--r--OpenSim/Services/GridService/GridService.cs10
2 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 9e4671f..37c648c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -943,6 +943,7 @@ namespace OpenSim
943 cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize); 943 cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize);
944 cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize); 944 cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize);
945 cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize); 945 cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize);
946 cdt.AddColumn("Size", 11);
946 cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize); 947 cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize);
947 cdt.AddColumn("Ready?", 6); 948 cdt.AddColumn("Ready?", 6);
948 cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize); 949 cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
@@ -951,8 +952,13 @@ namespace OpenSim
951 { 952 {
952 RegionInfo ri = scene.RegionInfo; 953 RegionInfo ri = scene.RegionInfo;
953 cdt.AddRow( 954 cdt.AddRow(
954 ri.RegionName, ri.RegionID, string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 955 ri.RegionName,
955 ri.InternalEndPoint.Port, scene.Ready ? "Yes" : "No", ri.EstateSettings.EstateName); 956 ri.RegionID,
957 string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
958 string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
959 ri.InternalEndPoint.Port,
960 scene.Ready ? "Yes" : "No",
961 ri.EstateSettings.EstateName);
956 } 962 }
957 ); 963 );
958 964
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