From f08afc4f8705d2850326e26d9848d9651ef94363 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 20 Jul 2010 14:28:17 -0700
Subject: Restore lines that have been removed due to previous merge conflict.

---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 4a392cb..4ae53a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -598,10 +598,14 @@ namespace OpenSim.Region.Framework.Scenes
                 // changed since permissions were last set.
                 if (item.GroupPermissions != (uint)PermissionMask.None)
                     item.GroupID = m_part.GroupID;
-                        
+
                 if (item.AssetID == UUID.Zero)
+                    item.AssetID = it.AssetID;
+
+                lock (m_items)
                 {
-                    item.AssetID = m_items[item.ItemID].AssetID;
+                    m_items[item.ItemID] = item;
+                    m_inventorySerial++;
                 }
 
                 if (fireScriptEvents)
-- 
cgit v1.1