From f2889d7ce97a01086dc7fc0690865a1eae452364 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 15 Oct 2011 02:12:46 +0100 Subject: [PATCH] remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate() --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2659a69a75..05c9924d6f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -4334,9 +4334,7 @@ namespace OpenSim.Region.Framework.Scenes bool wasVD = VolumeDetectActive; if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) - { return; - } // Special cases for VD. VD can only be called from a script // and can't be combined with changes to other states. So we can rely @@ -4450,8 +4448,6 @@ namespace OpenSim.Region.Framework.Scenes } else // it already has a physical representation { - PhysActor.IsPhysical = UsePhysics; - DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim if (!m_parentGroup.IsDeleted)