aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-11 05:19:54 +0000
committerTeravus Ovares2008-02-11 05:19:54 +0000
commite6453d9b9d347ee366590c05053f38abb4852b43 (patch)
treeef7fbec17f32ffccd800d102c5947b14b83dec34 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parent* um, Prim crossings? Experimental. (diff)
downloadopensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.zip
opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.gz
opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.bz2
opensim-SC_OLD-e6453d9b9d347ee366590c05053f38abb4852b43.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs15
1 files changed, 9 insertions, 6 deletions
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
1726 { 1726 {
1727 if (m_parts.Count > 1) 1727 if (m_parts.Count > 1)
1728 { 1728 {
1729 foreach (SceneObjectPart part in m_parts.Values) 1729 lock (m_parts)
1730 { 1730 {
1731 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim); 1731 foreach (SceneObjectPart part in m_parts.Values)
1732 1732 {
1733 // Hack to get the physics scene geometries in the right spot 1733 part.ApplyPhysics(m_rootPart.ObjectFlags, m_physicalPrim);
1734 ResetChildPrimPhysicsPositions(); 1734
1735 1735 // Hack to get the physics scene geometries in the right spot
1736 ResetChildPrimPhysicsPositions();
1737
1738 }
1736 } 1739 }
1737 } 1740 }
1738 else 1741 else