From 90ec9c46d5eaa6018f2bad09b188e07836ceef43 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 12 Sep 2008 00:45:24 +0000 Subject: [PATCH] * Move the ResetChildPrimPhysics() calls to after physics have been applied to the parts rather than after each individual part * From looking at the code there shouldn't be any difference, and this appears to speed up prim loading and make a certain failure case (where prims seem to be going out of bounds on startup) less of a problem. * However, if I've been bad please revert this patch --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index f52e764566..84970c2ed4 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1092,11 +1092,11 @@ namespace OpenSim.Region.Environment.Scenes if (part.LocalId != m_rootPart.LocalId) { part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_physicalPrim); - } - - // Hack to get the physics scene geometries in the right spot - ResetChildPrimPhysicsPositions(); - } + } + } + + // Hack to get the physics scene geometries in the right spot + ResetChildPrimPhysicsPositions(); } else {