From e6453d9b9d347ee366590c05053f38abb4852b43 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Mon, 11 Feb 2008 05:19:54 +0000
Subject: * Changed child_get_tasks to see_into_this_sim_from_neighbor. *
 Turned on see_into_this_sim_from_neighbor by default. * Fix Race Condition
 with parts being added to a group while the simulator is starting up.

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 05b9014..83f0c27 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1726,13 +1726,16 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (m_parts.Count > 1)
             {
-                foreach (SceneObjectPart part in m_parts.Values)
+                lock (m_parts)
                 {
-                    part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
-                    
-                    // Hack to get the physics scene geometries in the right spot
-                    ResetChildPrimPhysicsPositions();
-                   
+                    foreach (SceneObjectPart part in m_parts.Values)
+                    {
+                        part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
+
+                        // Hack to get the physics scene geometries in the right spot
+                        ResetChildPrimPhysicsPositions();
+
+                    }
                 }
             }
             else
-- 
cgit v1.1