diff options
author | Melanie | 2013-04-28 19:03:39 +0200 |
---|---|---|
committer | Melanie | 2013-04-28 19:03:39 +0200 |
commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Framework/Console/ConsoleDisplayTable.cs | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | Controller module for dynamic floaters (WIP) (diff) | |
download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to 'OpenSim/Framework/Console/ConsoleDisplayTable.cs')
-rw-r--r-- | OpenSim/Framework/Console/ConsoleDisplayTable.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Framework/Console/ConsoleDisplayTable.cs b/OpenSim/Framework/Console/ConsoleDisplayTable.cs index c620dfe..711a337 100644 --- a/OpenSim/Framework/Console/ConsoleDisplayTable.cs +++ b/OpenSim/Framework/Console/ConsoleDisplayTable.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console | |||
56 | public List<ConsoleDisplayTableRow> Rows { get; private set; } | 56 | public List<ConsoleDisplayTableRow> Rows { get; private set; } |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Number of spaces to indent the table. | 59 | /// Number of spaces to indent the whole table. |
60 | /// </summary> | 60 | /// </summary> |
61 | public int Indent { get; set; } | 61 | public int Indent { get; set; } |
62 | 62 | ||
@@ -84,7 +84,7 @@ namespace OpenSim.Framework.Console | |||
84 | Columns.Add(new ConsoleDisplayTableColumn(name, width)); | 84 | Columns.Add(new ConsoleDisplayTableColumn(name, width)); |
85 | } | 85 | } |
86 | 86 | ||
87 | public void AddRow(params string[] cells) | 87 | public void AddRow(params object[] cells) |
88 | { | 88 | { |
89 | Rows.Add(new ConsoleDisplayTableRow(cells)); | 89 | Rows.Add(new ConsoleDisplayTableRow(cells)); |
90 | } | 90 | } |
@@ -113,7 +113,8 @@ namespace OpenSim.Framework.Console | |||
113 | 113 | ||
114 | for (int i = 0; i < Columns.Count; i++) | 114 | for (int i = 0; i < Columns.Count; i++) |
115 | { | 115 | { |
116 | formatSb.Append(' ', TableSpacing); | 116 | if (i != 0) |
117 | formatSb.Append(' ', TableSpacing); | ||
117 | 118 | ||
118 | // Can only do left formatting for now | 119 | // Can only do left formatting for now |
119 | formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width); | 120 | formatSb.AppendFormat("{{{0},-{1}}}", i, Columns[i].Width); |
@@ -139,16 +140,16 @@ namespace OpenSim.Framework.Console | |||
139 | 140 | ||
140 | public struct ConsoleDisplayTableRow | 141 | public struct ConsoleDisplayTableRow |
141 | { | 142 | { |
142 | public List<string> Cells { get; private set; } | 143 | public List<object> Cells { get; private set; } |
143 | 144 | ||
144 | public ConsoleDisplayTableRow(List<string> cells) : this() | 145 | public ConsoleDisplayTableRow(List<object> cells) : this() |
145 | { | 146 | { |
146 | Cells = cells; | 147 | Cells = cells; |
147 | } | 148 | } |
148 | 149 | ||
149 | public ConsoleDisplayTableRow(params string[] cells) : this() | 150 | public ConsoleDisplayTableRow(params object[] cells) : this() |
150 | { | 151 | { |
151 | Cells = new List<string>(cells); | 152 | Cells = new List<object>(cells); |
152 | } | 153 | } |
153 | } | 154 | } |
154 | } \ No newline at end of file | 155 | } \ No newline at end of file |