From 4ccc141764083ae6dfc0b5b8e303a4395e66b684 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 20 Jul 2010 21:49:31 +0100
Subject: Resync with master
---
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 44b76b7..8b4f0ed 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -749,13 +749,7 @@ namespace OpenSim.Region.Framework.Scenes
item.GroupID = m_part.GroupID;
if (item.AssetID == UUID.Zero)
- item.AssetID = it.AssetID;
-
- lock (m_items)
- {
- m_items[item.ItemID] = item;
- m_inventorySerial++;
- }
+ item.AssetID = m_items[item.ItemID].AssetID;
m_items[item.ItemID] = item;
m_inventorySerial++;
--
cgit v1.1