OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -749,13 +749,7 @@ namespace OpenSim.Region.Framework.Scenes
item.GroupID = m_part.GroupID; item.GroupID = m_part.GroupID;
if (item.AssetID == UUID.Zero) if (item.AssetID == UUID.Zero)
item.AssetID = it.AssetID; item.AssetID = m_items[item.ItemID].AssetID;
lock (m_items)
{
m_items[item.ItemID] = item;
m_inventorySerial++;
}
m_items[item.ItemID] = item; m_items[item.ItemID] = item;
m_inventorySerial++; m_inventorySerial++;