diff options
| author | Melanie | 2011-10-25 01:53:24 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:53:24 +0100 |
| commit | 9dd7d9c16cf62d6881914e25b05d3f82b307768c (patch) | |
| tree | 32f798fec51ea68d5bd49204f404087018ff9766 /OpenSim | |
| parent | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge (diff) | |
| parent | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ... (diff) | |
| download | opensim-SC_OLD-9dd7d9c16cf62d6881914e25b05d3f82b307768c.zip opensim-SC_OLD-9dd7d9c16cf62d6881914e25b05d3f82b307768c.tar.gz opensim-SC_OLD-9dd7d9c16cf62d6881914e25b05d3f82b307768c.tar.bz2 opensim-SC_OLD-9dd7d9c16cf62d6881914e25b05d3f82b307768c.tar.xz | |
Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 97434bd..dbd599e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -4389,9 +4389,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4389 | bool wasVD = VolumeDetectActive; | 4389 | bool wasVD = VolumeDetectActive; |
| 4390 | 4390 | ||
| 4391 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) | 4391 | if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) |
| 4392 | { | ||
| 4393 | return; | 4392 | return; |
| 4394 | } | ||
| 4395 | 4393 | ||
| 4396 | // Special cases for VD. VD can only be called from a script | 4394 | // Special cases for VD. VD can only be called from a script |
| 4397 | // and can't be combined with changes to other states. So we can rely | 4395 | // and can't be combined with changes to other states. So we can rely |
| @@ -4505,8 +4503,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4505 | } | 4503 | } |
| 4506 | else // it already has a physical representation | 4504 | else // it already has a physical representation |
| 4507 | { | 4505 | { |
| 4508 | PhysActor.IsPhysical = UsePhysics; | ||
| 4509 | |||
| 4510 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim | 4506 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim |
| 4511 | 4507 | ||
| 4512 | if (!m_parentGroup.IsDeleted) | 4508 | if (!m_parentGroup.IsDeleted) |