From 66dc421be7974c6aafb12f318a7649dca99f0989 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 9 Feb 2009 20:06:06 +0000 Subject: a last set of files that seem to have embedded ^M in them --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ba2b55e..d3b9626 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -1023,7 +1023,7 @@ namespace OpenSim.Region.Framework.Scenes // at region startup // teravus: After this was removed from the linking algorithm, Linked prims no longer collided - // properly when non-physical if they havn't been moved. This breaks ALL builds. + // properly when non-physical if they havn't been moved. This breaks ALL builds. // see: http://opensimulator.org/mantis/view.php?id=3108 // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the @@ -2074,12 +2074,12 @@ namespace OpenSim.Region.Framework.Scenes // Can't do this yet since backup still makes use of the root part without any synchronization // objectGroup.m_rootPart = null; - AttachToBackup(); - - - // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the - // position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and - // unmoved prims! + AttachToBackup(); + + + // Here's the deal, this is ABSOLUTELY CRITICAL so the physics scene gets the update about the + // position of linkset prims. IF YOU CHANGE THIS, YOU MUST TEST colliding with just linked and + // unmoved prims! ResetChildPrimPhysicsPositions(); HasGroupChanged = true; -- cgit v1.1