diff options
| author | Melanie | 2012-03-13 13:12:14 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-13 13:12:14 +0100 |
| commit | 22e0cc09ac4bc4ed639d1203d930309f687fdb6f (patch) | |
| tree | 3a9ad1772d26f8b4f9b730121ed689aaab4aa88c /OpenSim | |
| parent | Refactor, move OjectChangeData into it's own file and rename (diff) | |
| download | opensim-SC-22e0cc09ac4bc4ed639d1203d930309f687fdb6f.zip opensim-SC-22e0cc09ac4bc4ed639d1203d930309f687fdb6f.tar.gz opensim-SC-22e0cc09ac4bc4ed639d1203d930309f687fdb6f.tar.bz2 opensim-SC-22e0cc09ac4bc4ed639d1203d930309f687fdb6f.tar.xz | |
Ensure child prims of a phantom prim are marked as phantom
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b2502e0..314705e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2556 | linkPart.CreateSelected = true; | 2556 | linkPart.CreateSelected = true; |
| 2557 | 2557 | ||
| 2558 | // let physics know preserve part volume dtc messy since UpdatePrimFlags doesn't look to parent changes for now | 2558 | // let physics know preserve part volume dtc messy since UpdatePrimFlags doesn't look to parent changes for now |
| 2559 | linkPart.UpdatePrimFlags(grpusephys, grptemporary, (linkPart.Flags & PrimFlags.Phantom) != null, linkPart.VolumeDetectActive, true); | 2559 | linkPart.UpdatePrimFlags(grpusephys, grptemporary, IsPhantom || ((linkPart.Flags & PrimFlags.Phantom) != null), linkPart.VolumeDetectActive, true); |
| 2560 | if (linkPart.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) | 2560 | if (linkPart.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) |
| 2561 | { | 2561 | { |
| 2562 | linkPart.PhysActor.link(m_rootPart.PhysActor); | 2562 | linkPart.PhysActor.link(m_rootPart.PhysActor); |
| @@ -2578,7 +2578,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2578 | { | 2578 | { |
| 2579 | LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); | 2579 | LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); |
| 2580 | // let physics know | 2580 | // let physics know |
| 2581 | part.UpdatePrimFlags(grpusephys, grptemporary, (part.Flags & PrimFlags.Phantom) != null, part.VolumeDetectActive, true); | 2581 | part.UpdatePrimFlags(grpusephys, grptemporary, IsPhantom || ((part.Flags & PrimFlags.Phantom) != null), part.VolumeDetectActive, true); |
| 2582 | if (part.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) | 2582 | if (part.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) |
| 2583 | { | 2583 | { |
| 2584 | part.PhysActor.link(m_rootPart.PhysActor); | 2584 | part.PhysActor.link(m_rootPart.PhysActor); |