Committing the LCO database layer. Native MySQL, no ADO. New reconnect

mechanism to prevent prim loss. Preserve link order on sim restart
and drag copy. Fix drag-copied prims' inventories. Fix persistence
of child prim inventories.

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e97b99f..5b494d3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1263,10 +1263,18 @@ if (m_shape != null) {
             dupe._category = _category;
             dupe.m_rezzed = m_rezzed;
 
-            dupe.m_inventory.Items = (TaskInventoryDictionary)dupe.m_inventory.Items.Clone();
+            dupe.m_inventory = new SceneObjectPartInventory(dupe);
+            dupe.m_inventory.Items = (TaskInventoryDictionary)m_inventory.Items.Clone();
 
             if (userExposed)
+            {
                 dupe.ResetIDs(linkNum);
+                dupe.m_inventory.HasInventoryChanged = true;
+            }
+            else
+            {
+                dupe.m_inventory.HasInventoryChanged = m_inventory.HasInventoryChanged;
+            }
 
             // Move afterwards ResetIDs as it clears the localID
             dupe.LocalId = localID;