diff options
| author | Melanie | 2013-03-22 01:01:24 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-22 01:01:24 +0000 |
| commit | 68b910c1ff03d241e2aec65ebe67ffaa58babbf6 (patch) | |
| tree | 7b59aed339b6d13602b0ba9d65d04b9a920abe00 /OpenSim/Region/OptionalModules/Avatar | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Implement chat across region borders since we can tell if avatars in neighbou... (diff) | |
| download | opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.zip opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.gz opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.bz2 opensim-SC-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs index d97e3b3..0333747 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | |||
| @@ -176,16 +176,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
| 176 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", | 176 | // " {0,-36} {1,-10} {2,-36} {3,-14} {4,-15}\n", |
| 177 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, | 177 | // attachmentObject.Name, attachmentObject.LocalId, attachmentObject.FromItemID, |
| 178 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); | 178 | // (AttachmentPoint)attachmentObject.AttachmentPoint, attachmentObject.RootPart.AttachedPos); |
| 179 | ct.Rows.Add( | 179 | |
| 180 | new ConsoleDisplayTableRow( | 180 | ct.AddRow( |
| 181 | new List<string>() | 181 | attachmentObject.Name, |
| 182 | { | 182 | attachmentObject.LocalId, |
| 183 | attachmentObject.Name, | 183 | attachmentObject.FromItemID, |
| 184 | attachmentObject.LocalId.ToString(), | 184 | ((AttachmentPoint)attachmentObject.AttachmentPoint), |
| 185 | attachmentObject.FromItemID.ToString(), | 185 | attachmentObject.RootPart.AttachedPos); |
| 186 | ((AttachmentPoint)attachmentObject.AttachmentPoint).ToString(), | ||
| 187 | attachmentObject.RootPart.AttachedPos.ToString() | ||
| 188 | })); | ||
| 189 | // } | 186 | // } |
| 190 | } | 187 | } |
| 191 | 188 | ||