diff options
| author | Melanie | 2010-07-20 21:47:53 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-20 21:47:53 +0100 |
| commit | c0b8cbd85b2a618b9ad10bc703c1f65b03d0bc74 (patch) | |
| tree | 0c4493f0adc9e468f637c4c2e5db037da31285e0 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Restore lines that have been removed due to previous merge conflict. (diff) | |
| download | opensim-SC_OLD-c0b8cbd85b2a618b9ad10bc703c1f65b03d0bc74.zip opensim-SC_OLD-c0b8cbd85b2a618b9ad10bc703c1f65b03d0bc74.tar.gz opensim-SC_OLD-c0b8cbd85b2a618b9ad10bc703c1f65b03d0bc74.tar.bz2 opensim-SC_OLD-c0b8cbd85b2a618b9ad10bc703c1f65b03d0bc74.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 144207f..44b76b7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -749,8 +749,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 749 | item.GroupID = m_part.GroupID; | 749 | item.GroupID = m_part.GroupID; |
| 750 | 750 | ||
| 751 | if (item.AssetID == UUID.Zero) | 751 | if (item.AssetID == UUID.Zero) |
| 752 | item.AssetID = it.AssetID; | ||
| 753 | |||
| 754 | lock (m_items) | ||
| 752 | { | 755 | { |
| 753 | item.AssetID = m_items[item.ItemID].AssetID; | 756 | m_items[item.ItemID] = item; |
| 757 | m_inventorySerial++; | ||
| 754 | } | 758 | } |
| 755 | 759 | ||
| 756 | m_items[item.ItemID] = item; | 760 | m_items[item.ItemID] = item; |