diff options
author | Mandarinka Tasty | 2016-11-05 03:19:15 +0100 |
---|---|---|
committer | UbitUmarov | 2016-11-05 13:47:29 +0000 |
commit | 72db2d064a7511c319888f46a5b7242c794bf5f9 (patch) | |
tree | 838e8fdd638af2ba0fa7ba6047c2e10c2b71fc1a /OpenSim/Region/OptionalModules/Avatar | |
parent | by design HUD objects are private (diff) | |
download | opensim-SC_OLD-72db2d064a7511c319888f46a5b7242c794bf5f9.zip opensim-SC_OLD-72db2d064a7511c319888f46a5b7242c794bf5f9.tar.gz opensim-SC_OLD-72db2d064a7511c319888f46a5b7242c794bf5f9.tar.bz2 opensim-SC_OLD-72db2d064a7511c319888f46a5b7242c794bf5f9.tar.xz |
It looks, that attachments show console command incorrectly returns Item ID. In fact, FromItem ID is returned. So I have added proper Item ID to be returned. There are cases, that FromItem ID is also useful, so I keep it for compatibility.
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs index 0333747..a147e9b 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | |||
@@ -144,14 +144,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
144 | 144 | ||
145 | private void GetAttachmentsReport(ScenePresence sp, StringBuilder sb) | 145 | private void GetAttachmentsReport(ScenePresence sp, StringBuilder sb) |
146 | { | 146 | { |
147 | sb.AppendFormat("Attachments for {0}\n", sp.Name); | 147 | sb.AppendFormat("Attachments for {0}\n\n", sp.Name); |
148 | 148 | ||
149 | ConsoleDisplayTable ct = new ConsoleDisplayTable() { Indent = 2 }; | 149 | ConsoleDisplayList ct = new ConsoleDisplayList(); |
150 | ct.Columns.Add(new ConsoleDisplayTableColumn("Attachment Name", 50)); | ||
151 | ct.Columns.Add(new ConsoleDisplayTableColumn("Local ID", 10)); | ||
152 | ct.Columns.Add(new ConsoleDisplayTableColumn("Item ID", 36)); | ||
153 | ct.Columns.Add(new ConsoleDisplayTableColumn("Attach Point", 14)); | ||
154 | ct.Columns.Add(new ConsoleDisplayTableColumn("Position", 15)); | ||
155 | 150 | ||
156 | // sb.AppendFormat( | 151 | // sb.AppendFormat( |
157 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", | 152 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", |
@@ -177,17 +172,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
177 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, | 172 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, |
178 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); | 173 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); |
179 | 174 | ||
180 | ct.AddRow( | 175 | ct.Indent = 2; |
181 | attachmentObject.Name, | 176 | ct.AddRow("Attachment Name", attachmentObject.Name); |
182 | attachmentObject.LocalId, | 177 | ct.AddRow("Local ID", attachmentObject.LocalId); |
183 | attachmentObject.FromItemID, | 178 | ct.AddRow("Item ID", attachmentObject.UUID); |
184 | ((AttachmentPoint)attachmentObject.AttachmentPoint), | 179 | ct.AddRow("From Item ID", attachmentObject.FromItemID); |
185 | attachmentObject.RootPart.AttachedPos); | 180 | ct.AddRow("Attach Point", ((AttachmentPoint)attachmentObject.AttachmentPoint)); |
181 | ct.AddRow("Position", attachmentObject.RootPart.AttachedPos + "\n\n"); | ||
186 | // } | 182 | // } |
187 | } | 183 | } |
188 | 184 | ||
189 | ct.AddToStringBuilder(sb); | 185 | ct.AddToStringBuilder(sb); |
190 | sb.Append("\n"); | ||
191 | } | 186 | } |
192 | } | 187 | } |
193 | } \ No newline at end of file | 188 | } \ No newline at end of file |