Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface

No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately

2 files changed, 13 insertions, 16 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index b7ecb55..fe19099 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -300,12 +300,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             return null;
         }
         
-        public UUID SetAttachmentInventoryStatus(
+        /// <summary>
+        /// Update the user inventory to the attachment of an item
+        /// </summary>
+        /// <param name="att"></param>
+        /// <param name="remoteClient"></param>
+        /// <param name="itemID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <returns></returns>        
+        protected UUID SetAttachmentInventoryStatus(
             SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
         {
-            m_log.DebugFormat(
-                "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 
-                remoteClient.Name, att.Name, itemID);
+//            m_log.DebugFormat(
+//                "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 
+//                remoteClient.Name, att.Name, itemID);
             
             if (!att.IsDeleted)
                 AttachmentPt = att.RootPart.AttachmentPoint;
@@ -387,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 // Save avatar attachment information
                 if (m_scene.AvatarFactory != null)
                 {
-                    m_log.Debug("[ATTACHMENTS MODULE]: Dettaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
+                    m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
                     m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
                 }
             }
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 1140b9b..24e481b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -109,17 +109,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="itemID"></param>
         /// <param name="remoteClient"></param>
         void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient);
-            
-        /// <summary>
-        /// Update the user inventory to the attachment of an item
-        /// </summary>
-        /// <param name="att"></param>
-        /// <param name="remoteClient"></param>
-        /// <param name="itemID"></param>
-        /// <param name="AttachmentPt"></param>
-        /// <returns></returns>
-        UUID SetAttachmentInventoryStatus(
-            SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
 
         /// <summary>
         /// Update the user inventory to show a detach.