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

Restore lines that have been removed due to previous merge conflict.

prebuild-update
Diva Canto 2010-07-20 14:28:17 -07:00
parent 176cb01130
commit f08afc4f87
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,10 +598,14 @@ namespace OpenSim.Region.Framework.Scenes
// changed since permissions were last set. // changed since permissions were last set.
if (item.GroupPermissions != (uint)PermissionMask.None) if (item.GroupPermissions != (uint)PermissionMask.None)
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++;
} }
if (fireScriptEvents) if (fireScriptEvents)