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

1 files changed, 23 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e25b1f1..9f1575d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -156,21 +156,29 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         break;
                     }
-                   else 
-                   {
-                       // We also need to check the children of this prim as they
-                       // can be selected as well and send property information
-                       bool foundPrim = false;
-                       foreach (KeyValuePair<UUID, SceneObjectPart> child in ((SceneObjectGroup) ent).Children)
-                       {
-                           if (child.Value.LocalId == primLocalID) 
-                           {
-                               child.Value.GetProperties(remoteClient);
-                               foundPrim = true;
-                               break;
-                           }
-                       }
-                       if (foundPrim) break;
+                    else 
+                    {
+                        // We also need to check the children of this prim as they
+                        // can be selected as well and send property information
+                        bool foundPrim = false;
+                        
+                        SceneObjectGroup sog = ent as SceneObjectGroup;
+                        
+                        lock (sog.Children)
+                        {
+                            foreach (KeyValuePair<UUID, SceneObjectPart> child in (sog.Children))
+                            {
+                                if (child.Value.LocalId == primLocalID) 
+                                {
+                                    child.Value.GetProperties(remoteClient);
+                                    foundPrim = true;
+                                    break;
+                                }
+                            }
+                        }
+                            
+                        if (foundPrim) 
+                            break;
                    }
                 }
             }