1 files changed, 13 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 5a06bdb..65ce13a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -46,12 +46,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ForceInventoryPersistence()
         {
-            lock (m_parts)
+            lockPartsForRead(true);

+            List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);

+            lockPartsForRead(false);
+            foreach (SceneObjectPart part in values)
             {
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    part.Inventory.ForceInventoryPersistence();
-                }
+                part.Inventory.ForceInventoryPersistence();
             }
         }
 
@@ -75,14 +75,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// Stop the scripts contained in all the prims in this group
         /// </summary>
         public void RemoveScriptInstances()
-        {
-            lock (m_parts)
+        {

+            lockPartsForRead(true);

+            List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);

+            lockPartsForRead(false);
+            
+            foreach (SceneObjectPart part in values)
             {
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    part.Inventory.RemoveScriptInstances();
-                }
+                part.Inventory.RemoveScriptInstances();
             }
+            
         }
 
         /// <summary>