1 files changed, 16 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 1fa77e4..0222b02 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -59,13 +59,27 @@ namespace OpenSim.Region.Framework.Interfaces
             IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent);
 
         /// <summary>
-        /// Rez an attachment from user inventory
+        /// Rez an attachment from user inventory and change inventory status to match.
         /// </summary>
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
         /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
-        SceneObjectGroup RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);        
+        UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
+
+        /// <summary>
+        /// Rez an attachment from user inventory
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="itemID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <param name="updateinventoryStatus">
+        /// If true, we also update the user's inventory to show that the attachment is set.  If false, we do not.
+        /// False is required so that we don't attempt to update information when a user enters a scene with the
+        /// attachment already correctly set up in inventory.
+        /// <returns>The uuid of the scene object that was attached.  Null if the scene object could not be found</returns>
+        UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
 
         /// <summary>
         /// Update the user inventory to the attachment of an item