diff options
author | Melanie | 2010-12-22 13:45:21 +0100 |
---|---|---|
committer | Melanie | 2010-12-22 13:45:21 +0100 |
commit | 32cc569b008e4d847530577081528c7baf51d8bb (patch) | |
tree | 88e1beab72b046de7d600aec672a53b6a8ac4895 /OpenSim/Region | |
parent | Prevent a null ref when an avatar login doesn't go as planned (diff) | |
download | opensim-SC-32cc569b008e4d847530577081528c7baf51d8bb.zip opensim-SC-32cc569b008e4d847530577081528c7baf51d8bb.tar.gz opensim-SC-32cc569b008e4d847530577081528c7baf51d8bb.tar.bz2 opensim-SC-32cc569b008e4d847530577081528c7baf51d8bb.tar.xz |
Fix up some locking issues in task inventory. Don't use any prior versions in production!
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index da1b983..9412e09 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -959,6 +959,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
959 | if (m_inventorySerial == 0) // No inventory | 959 | if (m_inventorySerial == 0) // No inventory |
960 | { | 960 | { |
961 | client.SendTaskInventory(m_part.UUID, 0, new byte[0]); | 961 | client.SendTaskInventory(m_part.UUID, 0, new byte[0]); |
962 | Items.LockItemsForRead(false); | ||
962 | return; | 963 | return; |
963 | } | 964 | } |
964 | 965 | ||
@@ -971,6 +972,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
971 | { | 972 | { |
972 | xferManager.AddNewFile(m_inventoryFileName, | 973 | xferManager.AddNewFile(m_inventoryFileName, |
973 | m_inventoryFileData); | 974 | m_inventoryFileData); |
975 | Items.LockItemsForRead(false); | ||
974 | return; | 976 | return; |
975 | } | 977 | } |
976 | } | 978 | } |