aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-06 00:40:24 +0000
committerJustin Clark-Casey (justincc)2014-03-06 00:40:24 +0000
commitaa2fb1ec250bab4dde750b29ca2fec4d69add506 (patch)
tree6b1c7f6e589e6f0892d165138fe2bceefd6d29a5
parentPrevent adding a land object if it overlaps any existing objects that have no... (diff)
downloadopensim-SC_OLD-aa2fb1ec250bab4dde750b29ca2fec4d69add506.zip
opensim-SC_OLD-aa2fb1ec250bab4dde750b29ca2fec4d69add506.tar.gz
opensim-SC_OLD-aa2fb1ec250bab4dde750b29ca2fec4d69add506.tar.bz2
opensim-SC_OLD-aa2fb1ec250bab4dde750b29ca2fec4d69add506.tar.xz
minor: Increase size of parcel name field in "land show" console command output. Construct table using CDT rather than string formats
-rw-r--r--OpenSim/Framework/Console/ConsoleDisplayUtil.cs7
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs24
2 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Framework/Console/ConsoleDisplayUtil.cs b/OpenSim/Framework/Console/ConsoleDisplayUtil.cs
index b65fd75..6417663 100644
--- a/OpenSim/Framework/Console/ConsoleDisplayUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleDisplayUtil.cs
@@ -35,9 +35,14 @@ namespace OpenSim.Framework.Console
35 public static class ConsoleDisplayUtil 35 public static class ConsoleDisplayUtil
36 { 36 {
37 public const int CoordTupleSize = 11; 37 public const int CoordTupleSize = 11;
38 public const int EstateNameSize = 20;
39 public const int PortSize = 5; 38 public const int PortSize = 5;
39
40 public const int EstateNameSize = 20;
41 public const int ParcelNameSize = 40;
40 public const int RegionNameSize = 20; 42 public const int RegionNameSize = 20;
43 public const int UserNameSize = 35;
44
41 public const int UuidSize = 36; 45 public const int UuidSize = 36;
46 public const int VectorSize = 15;
42 } 47 }
43} \ No newline at end of file 48} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 5c20899..dc7242f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -2088,27 +2088,27 @@ namespace OpenSim.Region.CoreModules.World.Land
2088 2088
2089 private void AppendParcelsSummaryReport(StringBuilder report) 2089 private void AppendParcelsSummaryReport(StringBuilder report)
2090 { 2090 {
2091 report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName); 2091 report.AppendFormat("Land information for {0}\n", m_scene.Name);
2092 report.AppendFormat( 2092
2093 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", 2093 ConsoleDisplayTable cdt = new ConsoleDisplayTable();
2094 "Parcel Name", 2094 cdt.AddColumn("Parcel Name", ConsoleDisplayUtil.ParcelNameSize);
2095 "Local ID", 2095 cdt.AddColumn("ID", 3);
2096 "Area", 2096 cdt.AddColumn("Area", 6);
2097 "Starts", 2097 cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
2098 "Ends", 2098 cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
2099 "Owner"); 2099 cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
2100 2100
2101 lock (m_landList) 2101 lock (m_landList)
2102 { 2102 {
2103 foreach (ILandObject lo in m_landList.Values) 2103 foreach (ILandObject lo in m_landList.Values)
2104 { 2104 {
2105 LandData ld = lo.LandData; 2105 LandData ld = lo.LandData;
2106 2106 cdt.AddRow(
2107 report.AppendFormat(
2108 "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
2109 ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID)); 2107 ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID));
2110 } 2108 }
2111 } 2109 }
2110
2111 report.Append(cdt.ToString());
2112 } 2112 }
2113 2113
2114 private void AppendParcelReport(StringBuilder report, ILandObject lo) 2114 private void AppendParcelReport(StringBuilder report, ILandObject lo)