aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-15 02:12:46 +0100
committerJustin Clark-Casey (justincc)2011-10-15 02:12:46 +0100
commitf2889d7ce97a01086dc7fc0690865a1eae452364 (patch)
tree8416b9d878612f3ba2f93ec3a29900cb57d66d99
parentrefactor: Remove redundant code in SOP.UpdatePrimFlags() (diff)
downloadopensim-SC_OLD-f2889d7ce97a01086dc7fc0690865a1eae452364.zip
opensim-SC_OLD-f2889d7ce97a01086dc7fc0690865a1eae452364.tar.gz
opensim-SC_OLD-f2889d7ce97a01086dc7fc0690865a1eae452364.tar.bz2
opensim-SC_OLD-f2889d7ce97a01086dc7fc0690865a1eae452364.tar.xz
remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its done immediately afterwards in DoPhysicsPropertyUpdate()
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2659a69..05c9924 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4334,9 +4334,7 @@ namespace OpenSim.Region.Framework.Scenes
4334 bool wasVD = VolumeDetectActive; 4334 bool wasVD = VolumeDetectActive;
4335 4335
4336 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) 4336 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
4337 {
4338 return; 4337 return;
4339 }
4340 4338
4341 // Special cases for VD. VD can only be called from a script 4339 // Special cases for VD. VD can only be called from a script
4342 // and can't be combined with changes to other states. So we can rely 4340 // and can't be combined with changes to other states. So we can rely
@@ -4450,8 +4448,6 @@ namespace OpenSim.Region.Framework.Scenes
4450 } 4448 }
4451 else // it already has a physical representation 4449 else // it already has a physical representation
4452 { 4450 {
4453 PhysActor.IsPhysical = UsePhysics;
4454
4455 DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim 4451 DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
4456 4452
4457 if (!m_parentGroup.IsDeleted) 4453 if (!m_parentGroup.IsDeleted)