Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 38 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 7edb43e..2e6faa0 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -58,6 +58,15 @@ namespace OpenSim.Region.Framework.Interfaces
         void ResetInventoryIDs();
 
         /// <summary>
+        /// Reset parent object UUID for all the items in the prim's inventory.
+        /// </summary>
+        /// 
+        /// If this method is called and there are inventory items, then we regard the inventory as having changed.
+        /// 
+        /// <param name="linkNum">Link number for the part</param>
+        void ResetObjectID();
+
+        /// <summary>
         /// Change every item in this inventory to a new owner.
         /// </summary>
         /// <param name="ownerId"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 024bdc9..95cd26f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Framework.Scenes
                 
                 // This is necessary so that TaskInventoryItem parent ids correctly reference the new uuid of this part
                 if (Inventory != null)
-                    Inventory.ResetInventoryIDs();
+                    Inventory.ResetObjectID();
             }
         }
 
@@ -2763,6 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID = UUID.Random();
             LinkNum = linkNum;
             LocalId = 0;
+                        Inventory.ResetInventoryIDs();
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 0e3daf76..210f5cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -140,6 +140,33 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void ResetObjectID()
+        {
+            lock (Items)
+            {
+                if (Items.Count == 0)
+                {
+                    return;
+                }
+    
+                HasInventoryChanged = true;
+                if (m_part.ParentGroup != null)
+                {
+                    m_part.ParentGroup.HasGroupChanged = true;
+                }
+                
+                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+                Items.Clear();
+    
+                foreach (TaskInventoryItem item in items)
+                {
+                    item.ParentPartID = m_part.UUID;
+                    item.ParentID = m_part.UUID;
+                    Items.Add(item.ItemID, item);
+                }
+            }
+        }
+
         /// <summary>
         /// Change every item in this inventory to a new owner.
         /// </summary>