diff options
author | Diva Canto | 2010-07-20 14:28:17 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-20 14:53:40 -0700 |
commit | 8641eb65b140d30a44bf9f4fb47d9cb3fcc77e34 (patch) | |
tree | 212bd1e934a8cb97ecfd7efdad9ea77c245f2a7f /OpenSim | |
parent | Remove a merge artefact (diff) | |
download | opensim-SC_OLD-8641eb65b140d30a44bf9f4fb47d9cb3fcc77e34.zip opensim-SC_OLD-8641eb65b140d30a44bf9f4fb47d9cb3fcc77e34.tar.gz opensim-SC_OLD-8641eb65b140d30a44bf9f4fb47d9cb3fcc77e34.tar.bz2 opensim-SC_OLD-8641eb65b140d30a44bf9f4fb47d9cb3fcc77e34.tar.xz |
Restore lines that have been removed due to previous merge conflict.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 21c5368..9eb92be 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) |