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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-07-20 21:47:53 +01:00
parent dcf7973c9b f08afc4f87
commit c0b8cbd85b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,8 +749,12 @@ 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;
lock (m_items)
{ {
item.AssetID = m_items[item.ItemID].AssetID; m_items[item.ItemID] = item;
m_inventorySerial++;
} }
m_items[item.ItemID] = item; m_items[item.ItemID] = item;