Attachment persistence!!! Patch #9170 (Mantis #1171)

Attachments now persist across logouts. Mostly untested.

2 files changed, 16 insertions, 5 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 3459504..81cf372 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -528,22 +528,26 @@ namespace OpenSim.Framework
             m_attachments[attachpoint][1] = asset;
         }
 
-        public void DetachAttachment(LLUUID itemID)
+        public int GetAttachpoint(LLUUID itemID)
         {
-            int attachpoint = 0;
-
             foreach (KeyValuePair<int, LLUUID[]> kvp in m_attachments)
             {
                 if(kvp.Value[0] == itemID)
                 {
-                    attachpoint = kvp.Key;
-                    break;
+                    return kvp.Key;
                 }
             }
+            return 0;
+        }
+
+        public void DetachAttachment(LLUUID itemID)
+        {
+            int attachpoint = GetAttachpoint(itemID);
 
             if(attachpoint > 0)
                 m_attachments.Remove(attachpoint);
         }
+
         string GetAttachmentsString()
         {
             List<string> strings = new List<string>();
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index c337907..a7d6349 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -47,11 +47,15 @@ namespace OpenSim.Framework.Communications.Cache
     internal delegate void SendInventoryDescendentsDelegate(
         IClientAPI client, LLUUID folderID, bool fetchFolders, bool fetchItems);
 
+    public delegate void OnItemReceivedDelegate(LLUUID itemID);
+
     /// <summary>
     /// Stores user profile and inventory data received from backend services for a particular user.
     /// </summary>
     public class CachedUserInfo
     {
+        public event OnItemReceivedDelegate OnItemReceived;
+
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -306,6 +310,9 @@ namespace OpenSim.Framework.Communications.Cache
             {
                 folder.Items[itemInfo.ID] = itemInfo;
             }
+
+            if (OnItemReceived != null)
+                OnItemReceived(itemInfo.ID);
         }
 
         /// <summary>