Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-07-20 21:47:53 +01:00

View File

@@ -749,8 +749,12 @@ namespace OpenSim.Region.Framework.Scenes
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++;
}
m_items[item.ItemID] = item;