aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-07-20 14:28:17 -0700
committerDiva Canto2010-07-20 14:28:17 -0700
commitf08afc4f8705d2850326e26d9848d9651ef94363 (patch)
tree3a8e89a316d8ed7cbd54161f7d1ddaf46067d120 /OpenSim/Region/Framework
parentRemove a merge artefact (diff)
downloadopensim-SC-f08afc4f8705d2850326e26d9848d9651ef94363.zip
opensim-SC-f08afc4f8705d2850326e26d9848d9651ef94363.tar.gz
opensim-SC-f08afc4f8705d2850326e26d9848d9651ef94363.tar.bz2
opensim-SC-f08afc4f8705d2850326e26d9848d9651ef94363.tar.xz
Restore lines that have been removed due to previous merge conflict.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 4a392cb..4ae53a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -598,10 +598,14 @@ namespace OpenSim.Region.Framework.Scenes
598 // changed since permissions were last set. 598 // changed since permissions were last set.
599 if (item.GroupPermissions != (uint)PermissionMask.None) 599 if (item.GroupPermissions != (uint)PermissionMask.None)
600 item.GroupID = m_part.GroupID; 600 item.GroupID = m_part.GroupID;
601 601
602 if (item.AssetID == UUID.Zero) 602 if (item.AssetID == UUID.Zero)
603 item.AssetID = it.AssetID;
604
605 lock (m_items)
603 { 606 {
604 item.AssetID = m_items[item.ItemID].AssetID; 607 m_items[item.ItemID] = item;
608 m_inventorySerial++;
605 } 609 }
606 610
607 if (fireScriptEvents) 611 if (fireScriptEvents)