aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAlan M Webb2009-09-29 08:35:21 -0400
committerdr scofield (aka dirk husemann)2009-09-29 16:55:03 +0200
commit2a7bedb5e93cca37093220bfc11cc4ce45e45cfe (patch)
tree341793fa041600e182714951e4d36c8d1da5da0f /OpenSim/Region
parent Given the perverse way that strided works, if (diff)
downloadopensim-SC_OLD-2a7bedb5e93cca37093220bfc11cc4ce45e45cfe.zip
opensim-SC_OLD-2a7bedb5e93cca37093220bfc11cc4ce45e45cfe.tar.gz
opensim-SC_OLD-2a7bedb5e93cca37093220bfc11cc4ce45e45cfe.tar.bz2
opensim-SC_OLD-2a7bedb5e93cca37093220bfc11cc4ce45e45cfe.tar.xz
This fix addresses the problem where phantom objects do not
always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ec262b0..cce45fe 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3455,6 +3455,7 @@ if (m_shape != null) {
3455 RotationOffset, 3455 RotationOffset,
3456 UsePhysics); 3456 UsePhysics);
3457 3457
3458 pa = PhysActor;
3458 if (pa != null) 3459 if (pa != null)
3459 { 3460 {
3460 pa.LocalID = LocalId; 3461 pa.LocalID = LocalId;
@@ -3513,7 +3514,6 @@ if (m_shape != null) {
3513 AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active 3514 AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
3514 this.VolumeDetectActive = true; 3515 this.VolumeDetectActive = true;
3515 } 3516 }
3516
3517 } 3517 }
3518 else 3518 else
3519 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like 3519 { // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like