From efebc809ce1ecbce0e3619af5439805f91e14870 Mon Sep 17 00:00:00 2001 From: dahlia Date: Sun, 4 Oct 2009 02:54:36 -0700 Subject: [PATCH] disable physics actors for flexible prims --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ea6bc9c319..801a7db3a5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -1344,7 +1344,8 @@ if (m_shape != null) { bool RigidBody = isPhysical && !isPhantom; // The only time the physics scene shouldn't know about the prim is if it's phantom or an attachment, which is phantom by definition - if (!isPhantom && !IsAttachment) + // or flexible + if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible)) { PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( Name, @@ -3426,8 +3427,8 @@ if (m_shape != null) { } } - - if (IsPhantom || IsAttachment) // note: this may have been changed above in the case of joints + + if (IsPhantom || IsAttachment || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints { AddFlag(PrimFlags.Phantom); PhysicsActor pa = PhysActor;