diff options
| author | Melanie | 2010-07-20 21:49:31 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-20 21:49:31 +0100 |
| commit | 4ccc141764083ae6dfc0b5b8e303a4395e66b684 (patch) | |
| tree | 27a98ed6885880531c28edb2931fa60e37040b23 | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-4ccc141764083ae6dfc0b5b8e303a4395e66b684.zip opensim-SC_OLD-4ccc141764083ae6dfc0b5b8e303a4395e66b684.tar.gz opensim-SC_OLD-4ccc141764083ae6dfc0b5b8e303a4395e66b684.tar.bz2 opensim-SC_OLD-4ccc141764083ae6dfc0b5b8e303a4395e66b684.tar.xz | |
Resync with master
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 44b76b7..8b4f0ed 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -749,13 +749,7 @@ 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; | 752 | item.AssetID = m_items[item.ItemID].AssetID; |
| 753 | |||
| 754 | lock (m_items) | ||
| 755 | { | ||
| 756 | m_items[item.ItemID] = item; | ||
| 757 | m_inventorySerial++; | ||
| 758 | } | ||
| 759 | 753 | ||
| 760 | m_items[item.ItemID] = item; | 754 | m_items[item.ItemID] = item; |
| 761 | m_inventorySerial++; | 755 | m_inventorySerial++; |