From 050007b44da97bf155fca95cadc32cb27924e263 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 02:30:16 +0100
Subject: Lay out "show region" information in an easier to read line by line
 format

---
 OpenSim/Services/GridService/GridService.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Services/GridService/GridService.cs')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 3dc87bc..b17fca7 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -509,19 +509,21 @@ namespace OpenSim.Services.GridService
                 return;
             }
 
-            MainConsole.Instance.Output("Region Name          Region UUID");
-            MainConsole.Instance.Output("Location             URI");
-            MainConsole.Instance.Output("Owner ID                                Flags");
-            MainConsole.Instance.Output("-------------------------------------------------------------------------------");
+            ICommandConsole con = MainConsole.Instance;
+
             foreach (RegionData r in regions)
             {
                 OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]);
-                MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} {5}\n\n",
-                        r.RegionName, r.RegionID,
-                        String.Format("{0},{1}", r.posX / Constants.RegionSize, r.posY / Constants.RegionSize),
-                        r.Data["serverURI"],
-                        r.Data["owner_uuid"], flags));
+
+                con.OutputFormat("{0,-11}: {1}", "Region Name", r.RegionName);
+                con.OutputFormat("{0,-11}: {1}", "Region ID", r.RegionID);
+                con.OutputFormat("{0,-11}: {1}", "Location", r.coordX, r.coordY);
+                con.OutputFormat("{0,-11}: {1}", "URI", r.Data["serverURI"]);
+                con.OutputFormat("{0,-11}: {1}", "Owner ID", r.Data["owner_uuid"]);
+                con.OutputFormat("{0,-11}: {1}", "Flags", flags);
+                con.Output("\n");
             }
+
             return;
         }
 
-- 
cgit v1.1


From c6ce41bfbab310eae2366ad494a0dbb42cebc070 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 02:31:53 +0100
Subject: Add missing Y co-ord in "show region" console command information

---
 OpenSim/Services/GridService/GridService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/GridService/GridService.cs')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index b17fca7..9d81eb5 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -517,7 +517,7 @@ namespace OpenSim.Services.GridService
 
                 con.OutputFormat("{0,-11}: {1}", "Region Name", r.RegionName);
                 con.OutputFormat("{0,-11}: {1}", "Region ID", r.RegionID);
-                con.OutputFormat("{0,-11}: {1}", "Location", r.coordX, r.coordY);
+                con.OutputFormat("{0,-11}: {1},{2}", "Location", r.coordX, r.coordY);
                 con.OutputFormat("{0,-11}: {1}", "URI", r.Data["serverURI"]);
                 con.OutputFormat("{0,-11}: {1}", "Owner ID", r.Data["owner_uuid"]);
                 con.OutputFormat("{0,-11}: {1}", "Flags", flags);
-- 
cgit v1.1


From 059a1e90b92c3c1ca027c0ec59f3628d87a954a6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 23 May 2012 03:19:25 +0100
Subject: Add ConsoleDisplayList for more consistent formatting of console
 output in list form.

Convert "show region" to use this structure rather than hand-constructing
---
 OpenSim/Services/GridService/GridService.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Services/GridService/GridService.cs')

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 9d81eb5..8a60ca5 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -509,19 +509,19 @@ namespace OpenSim.Services.GridService
                 return;
             }
 
-            ICommandConsole con = MainConsole.Instance;
-
             foreach (RegionData r in regions)
             {
                 OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]);
 
-                con.OutputFormat("{0,-11}: {1}", "Region Name", r.RegionName);
-                con.OutputFormat("{0,-11}: {1}", "Region ID", r.RegionID);
-                con.OutputFormat("{0,-11}: {1},{2}", "Location", r.coordX, r.coordY);
-                con.OutputFormat("{0,-11}: {1}", "URI", r.Data["serverURI"]);
-                con.OutputFormat("{0,-11}: {1}", "Owner ID", r.Data["owner_uuid"]);
-                con.OutputFormat("{0,-11}: {1}", "Flags", flags);
-                con.Output("\n");
+                ConsoleDisplayList dispList = new ConsoleDisplayList();
+                dispList.AddRow("Region Name", r.RegionName);
+                dispList.AddRow("Region ID", r.RegionID);
+                dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
+                dispList.AddRow("URI", r.Data["serverURI"]);
+                dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
+                dispList.AddRow("Flags", flags);
+
+                MainConsole.Instance.Output(dispList.ToString());
             }
 
             return;
-- 
cgit v1.1