diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Attachments')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | 5 |
2 files changed, 10 insertions, 12 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 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs index d7fb272..535bf67 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||
@@ -40,6 +40,7 @@ using OpenSim.Framework.Monitoring; | |||
40 | using OpenSim.Region.ClientStack.LindenUDP; | 40 | using OpenSim.Region.ClientStack.LindenUDP; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
43 | 44 | ||
44 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments | 45 | namespace OpenSim.Region.OptionalModules.Avatar.Attachments |
45 | { | 46 | { |
@@ -76,7 +77,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
76 | 77 | ||
77 | if (m_console != null) | 78 | if (m_console != null) |
78 | { | 79 | { |
79 | m_console.AddCommand("TempATtachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); | 80 | m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner or estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms); |
80 | } | 81 | } |
81 | } | 82 | } |
82 | else | 83 | else |
@@ -183,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments | |||
183 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); | 184 | hostPart.ParentGroup.RootPart.ScheduleFullUpdate(); |
184 | } | 185 | } |
185 | 186 | ||
186 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true) ? 1 : 0; | 187 | return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, false, true) ? 1 : 0; |
187 | } | 188 | } |
188 | } | 189 | } |
189 | } | 190 | } |