* Lock parts while they're being duplicated to prevent possible race conditions with other parts changers

* This shouldn't provoke any deadlocks since the callers aren't taking any other locks beforehand

1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index d026180..c3e3dfc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1392,8 +1392,14 @@ namespace OpenSim.Region.Environment.Scenes
                 SetRootPartOwner(m_rootPart, cAgentID, cGroupID);
                 m_rootPart.ScheduleFullUpdate();
             }
+            
+            List<SceneObjectPart> partList;
 
-            List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values);
+            lock (m_parts)
+            {                
+                partList = new List<SceneObjectPart>(m_parts.Values);
+            }
+            
             partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
                 {
                     return p1.LinkNum.CompareTo(p2.LinkNum);