From 01f70de2ea562f78991084be01a83295f8f2be0b Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 20 Feb 2009 14:04:29 +0000
Subject: * Consistently lock part.TaskInventory as pointed out in
 http://opensimulator.org/mantis/view.php?id=3159 * Not locking causes
 enumeration exceptions as described in this matis * part.TaskInventory needs
 to be locked for every access as it's a dictionary * Extra locking will
 hopefully not cause any major issues - in places where the enumeration of the
 dictionary performs other lock or long running operations, the dictionary is
 cloned instead

---
 OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Hypergrid')

diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 1a3c4c8..f7db908 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -226,9 +226,12 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
         {
             TaskInventoryDictionary tinv = sog.RootPart.TaskInventory;
 
-            foreach (TaskInventoryItem titem in tinv.Values)
+            lock (tinv)
             {
-                uuids.Add(titem.AssetID, (InventoryType)titem.Type == InventoryType.Texture);
+                foreach (TaskInventoryItem titem in tinv.Values)
+                {
+                    uuids.Add(titem.AssetID, (InventoryType)titem.Type == InventoryType.Texture);
+                }
             }
         }
 
-- 
cgit v1.1