Resync with master

avinationmerge
Melanie 2010-07-20 21:49:31 +01:00
parent c0b8cbd85b
commit 4ccc141764
1 changed files with 1 additions and 7 deletions

View File

@ -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++;