diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 14 |
2 files changed, 2 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index dde6ca6..67969b7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -326,12 +326,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
326 | public ISceneEntity RezSingleAttachmentFromInventory( | 326 | public ISceneEntity RezSingleAttachmentFromInventory( |
327 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 327 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
328 | { | 328 | { |
329 | return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true); | ||
330 | } | ||
331 | |||
332 | public ISceneEntity RezSingleAttachmentFromInventory( | ||
333 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) | ||
334 | { | ||
335 | // m_log.DebugFormat( | 329 | // m_log.DebugFormat( |
336 | // "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", | 330 | // "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", |
337 | // (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); | 331 | // (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); |
@@ -352,11 +346,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
352 | 346 | ||
353 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); | 347 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); |
354 | 348 | ||
355 | if (updateInventoryStatus) | 349 | if (att == null) |
356 | { | 350 | DetachSingleAttachmentToInv(itemID, sp.ControllingClient); |
357 | if (att == null) | ||
358 | DetachSingleAttachmentToInv(itemID, sp.ControllingClient); | ||
359 | } | ||
360 | 351 | ||
361 | return att; | 352 | return att; |
362 | } | 353 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index dd11ded..73d15a5 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -88,20 +88,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
88 | ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); | 88 | ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); |
89 | 89 | ||
90 | /// <summary> | 90 | /// <summary> |
91 | /// Rez an attachment from user inventory | ||
92 | /// </summary> | ||
93 | /// <param name="remoteClient"></param> | ||
94 | /// <param name="itemID"></param> | ||
95 | /// <param name="AttachmentPt"></param> | ||
96 | /// <param name="updateinventoryStatus"> | ||
97 | /// If true, we also update the user's inventory to show that the attachment is set. If false, we do not. | ||
98 | /// False is required so that we don't attempt to update information when a user enters a scene with the | ||
99 | /// attachment already correctly set up in inventory. | ||
100 | /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns> | ||
101 | ISceneEntity RezSingleAttachmentFromInventory( | ||
102 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); | ||
103 | |||
104 | /// <summary> | ||
105 | /// Rez multiple attachments from a user's inventory | 91 | /// Rez multiple attachments from a user's inventory |
106 | /// </summary> | 92 | /// </summary> |
107 | /// <param name="remoteClient"></param> | 93 | /// <param name="remoteClient"></param> |