Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking

1 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 4855d64..41501f2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -209,12 +209,15 @@ namespace OpenSim.Region.ScriptEngine.Shared
             else
                 Type = 0x02; // Passive
 
-            foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
+            lock (part.ParentGroup.Children)
             {
-                if (p.Inventory.ContainsScripts())
+                foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
                 {
-                    Type |= 0x08; // Scripted
-                    break;
+                    if (p.Inventory.ContainsScripts())
+                    {
+                        Type |= 0x08; // Scripted
+                        break;
+                    }
                 }
             }