Improve liveness by operating on list copies of SOG.Children where appropriate

1 files changed, 26 insertions, 25 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 9db2691..2c242c9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -380,34 +380,35 @@ namespace OpenSim.Region.Framework.Scenes
                             part.Shape.Scale = scale;
                         }
                     }
+                    
+                    m_numPrim += sceneObject.Children.Count;
+                }
         
-                    sceneObject.AttachToScene(m_parentScene);
+                sceneObject.AttachToScene(m_parentScene);
 
-                    if (sendClientUpdates)
-                        sceneObject.ScheduleGroupForFullUpdate();
-                                     
-                    Entities.Add(sceneObject);
-                    m_numPrim += sceneObject.Children.Count;
-    
-                    if (attachToBackup)
-                        sceneObject.AttachToBackup();
-    
-                    if (OnObjectCreate != null)
-                        OnObjectCreate(sceneObject);
+                if (sendClientUpdates)
+                    sceneObject.ScheduleGroupForFullUpdate();
+                                 
+                Entities.Add(sceneObject);                    
+
+                if (attachToBackup)
+                    sceneObject.AttachToBackup();
+
+                if (OnObjectCreate != null)
+                    OnObjectCreate(sceneObject);
+                
+                lock (SceneObjectGroupsByFullID)
+                {
+                    SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
+                        SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                }
                     
-                    lock (SceneObjectGroupsByFullID)
-                    {
-                        SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
-                        foreach (SceneObjectPart part in sceneObject.Children.Values)
-                            SceneObjectGroupsByFullID[part.UUID] = sceneObject;
-                    }
-                        
-                    lock (SceneObjectGroupsByLocalID)
-                    {
-                        SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
-                        foreach (SceneObjectPart part in sceneObject.Children.Values)
-                            SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
-                    }
+                lock (SceneObjectGroupsByLocalID)
+                {
+                    SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
+                        SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
                 }
             }