Change the way attachments are persisted. Editing a worn attachment will now

save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.

1 files changed, 20 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 522f75e..8fcfcc5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -131,12 +131,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            HasInventoryChanged = true;
-            if (m_part.ParentGroup != null)
-            {
-                m_part.ParentGroup.HasGroupChanged = true;
-            }
-            
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
             Items.Clear();
 
@@ -158,12 +152,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            HasInventoryChanged = true;
-            if (m_part.ParentGroup != null)
-            {
-                m_part.ParentGroup.HasGroupChanged = true;
-            }
-            
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
             Items.Clear();
 
@@ -216,8 +204,15 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            HasInventoryChanged = true;
-            m_part.ParentGroup.HasGroupChanged = true;
+            // Don't let this set the HasGroupChanged flag for attachments
+            // as this happens during rez and we don't want a new asset
+            // for each attachment each time
+            if (!m_part.ParentGroup.RootPart.IsAttachment)
+            {
+                HasInventoryChanged = true;
+                m_part.ParentGroup.HasGroupChanged = true;
+            }
+
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
             foreach (TaskInventoryItem item in items)
             {
@@ -824,11 +819,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>false if the item did not exist, true if the update occurred successfully</returns>
         public bool UpdateInventoryItem(TaskInventoryItem item)
         {
-            return UpdateInventoryItem(item, true);
+            return UpdateInventoryItem(item, true, true);
         }
 
         public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents)
         {
+            return UpdateInventoryItem(item, fireScriptEvents, true);
+        }
+
+        public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
+        {
             m_items.LockItemsForWrite(true);
 
             if (m_items.ContainsKey(item.ItemID))
@@ -849,8 +849,11 @@ namespace OpenSim.Region.Framework.Scenes
                 m_inventorySerial++;
                 if (fireScriptEvents)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                HasInventoryChanged = true;
-                m_part.ParentGroup.HasGroupChanged = true;
+                if (considerChanged)
+                {
+                    HasInventoryChanged = true;
+                    m_part.ParentGroup.HasGroupChanged = true;
+                }
                 m_items.LockItemsForWrite(false);
                 return true;
             }