Restore lines that have been removed due to previous merge conflict.
parent
176cb01130
commit
f08afc4f87
|
@ -600,8 +600,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++;
|
||||
}
|
||||
|
||||
if (fireScriptEvents)
|
||||
|
|
Loading…
Reference in New Issue