diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2654563..e5cfed0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2511,7 +2511,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2511 | // physics flags from group to be applied to linked parts | 2511 | // physics flags from group to be applied to linked parts |
2512 | bool grpusephys = UsesPhysics; | 2512 | bool grpusephys = UsesPhysics; |
2513 | bool grptemporary = IsTemporary; | 2513 | bool grptemporary = IsTemporary; |
2514 | bool gprphantom = IsPhantom; | ||
2515 | 2514 | ||
2516 | Vector3 oldGroupPosition = linkPart.GroupPosition; | 2515 | Vector3 oldGroupPosition = linkPart.GroupPosition; |
2517 | Quaternion oldRootRotation = linkPart.RotationOffset; | 2516 | Quaternion oldRootRotation = linkPart.RotationOffset; |
@@ -2557,7 +2556,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2557 | linkPart.CreateSelected = true; | 2556 | linkPart.CreateSelected = true; |
2558 | 2557 | ||
2559 | // 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 |
2560 | linkPart.UpdatePrimFlags(grpusephys, grptemporary, gprphantom, linkPart.VolumeDetectActive, true); | 2559 | linkPart.UpdatePrimFlags(grpusephys, grptemporary, (linkPart.Flags & PrimFlags.Phantom) != null, linkPart.VolumeDetectActive, true); |
2561 | 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) |
2562 | { | 2561 | { |
2563 | linkPart.PhysActor.link(m_rootPart.PhysActor); | 2562 | linkPart.PhysActor.link(m_rootPart.PhysActor); |
@@ -2579,7 +2578,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2579 | { | 2578 | { |
2580 | LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); | 2579 | LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++); |
2581 | // let physics know | 2580 | // let physics know |
2582 | part.UpdatePrimFlags(grpusephys, grptemporary, gprphantom, part.VolumeDetectActive, true); | 2581 | part.UpdatePrimFlags(grpusephys, grptemporary, (part.Flags & PrimFlags.Phantom) != null, part.VolumeDetectActive, true); |
2583 | 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) |
2584 | { | 2583 | { |
2585 | part.PhysActor.link(m_rootPart.PhysActor); | 2584 | part.PhysActor.link(m_rootPart.PhysActor); |