3 files changed, 31 insertions, 18 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 18a5733..5a6b265 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -427,19 +427,30 @@ namespace OpenSim.Framework
         /// 0x80 bit set then we assume this is an append
         /// operation otherwise we replace whatever is
         /// currently attached at the attachpoint
+        /// return true if something actually changed
         /// </summary>
-        public void SetAttachment(int attachpoint, UUID item, UUID asset)
+        public bool SetAttachment(int attachpoint, UUID item, UUID asset)
         {
             if (attachpoint == 0)
-                return;
+                return false;
 
             if (item == UUID.Zero)
             {
                 if (m_attachments.ContainsKey(attachpoint))
+                {
                     m_attachments.Remove(attachpoint);
-                return;
+                    return true;
+                }
+                return false;
             }
 
+            // check if the item is already attached at this point
+            if (GetAttachpoint(item) == (attachpoint & 0x7F))
+            {
+                // m_log.DebugFormat("[AVATAR APPEARANCE] attempt to attach an already attached item {0}",item);
+                return false;
+            }
+            
             // check if this is an append or a replace, 0x80 marks it as an append
             if ((attachpoint & 0x80) > 0)
             {
@@ -451,6 +462,7 @@ namespace OpenSim.Framework
             {
                 ReplaceAttachment(new AvatarAttachment(attachpoint,item,asset));
             }
+            return true;
         }
 
         public int GetAttachpoint(UUID itemID)
@@ -465,7 +477,7 @@ namespace OpenSim.Framework
             return 0;
         }
 
-        public void DetachAttachment(UUID itemID)
+        public bool DetachAttachment(UUID itemID)
         {
             foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
             {
@@ -478,9 +490,10 @@ namespace OpenSim.Framework
                     // And remove the list if there are no more attachments here
                     if (m_attachments[kvp.Key].Count == 0)
                         m_attachments.Remove(kvp.Key);
-                    return;
+                    return true;
                 }
             }
+            return false;
         }
 
         public void ClearAttachments()
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 360a014..ff26264 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -132,8 +132,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
                         + ", AttachmentPoint: " + AttachmentPt);
 
-                    if (m_scene.AvatarFactory != null)
-                        m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
                 }
             }
             catch (Exception e)
@@ -336,7 +334,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
 
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
+                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
+                if (changed && m_scene.AvatarFactory != null)
+                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
             }
             
             return att.UUID;
@@ -380,9 +380,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 // XXYY!!
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
-
-                if (m_scene.AvatarFactory != null)
+                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
+                if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
             }
         }
@@ -402,11 +401,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             ScenePresence presence;
             if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
-                presence.Appearance.DetachAttachment(itemID);
-
                 // Save avatar attachment information
                 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
-                if (m_scene.AvatarFactory != null)
+
+                bool changed = presence.Appearance.DetachAttachment(itemID);
+                if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
             }
 
@@ -431,9 +430,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     part.ParentGroup.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
                     return;
 
-                presence.Appearance.DetachAttachment(itemID);
-
-                if (m_scene.AvatarFactory != null)
+                bool changed = presence.Appearance.DetachAttachment(itemID);
+                if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
 
                 part.ParentGroup.DetachToGround();
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index ed0a290..f8ce444 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -217,7 +217,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     // update transaction. In theory, we should be able to do an immediate
                     // appearance send and save here.
 
-                    QueueAppearanceSave(client.AgentId);
+                    // save only if there were changes, send no matter what (doesn't hurt to send twice)
+                    if (changed)
+                        QueueAppearanceSave(client.AgentId);
                     QueueAppearanceSend(client.AgentId);
                 }