diff options
| author | UbitUmarov | 2012-03-13 18:00:27 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-13 18:00:27 +0000 |
| commit | 5086fe91767079bf209406b4794531d84c152da9 (patch) | |
| tree | 7c970d2341b59315c621103eeec5e942392043c8 /OpenSim/Region/Framework | |
| parent | initial suport for ExtraPhysical parts parameters. Reading from llclientView ... (diff) | |
| parent | Ensure child prims of a phantom prim are marked as phantom (diff) | |
| download | opensim-SC_OLD-5086fe91767079bf209406b4794531d84c152da9.zip opensim-SC_OLD-5086fe91767079bf209406b4794531d84c152da9.tar.gz opensim-SC_OLD-5086fe91767079bf209406b4794531d84c152da9.tar.bz2 opensim-SC_OLD-5086fe91767079bf209406b4794531d84c152da9.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -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); |