diff options
author | UbitUmarov | 2012-04-19 23:01:22 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-19 23:01:22 +0100 |
commit | aeb5aed5b70bbe9c54ec7647a70f8fca7d0aee7e (patch) | |
tree | 6dc51e7e14e72b8d950595e3a97ef7ac59f9eac1 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC_OLD-aeb5aed5b70bbe9c54ec7647a70f8fca7d0aee7e.zip opensim-SC_OLD-aeb5aed5b70bbe9c54ec7647a70f8fca7d0aee7e.tar.gz opensim-SC_OLD-aeb5aed5b70bbe9c54ec7647a70f8fca7d0aee7e.tar.bz2 opensim-SC_OLD-aeb5aed5b70bbe9c54ec7647a70f8fca7d0aee7e.tar.xz |
changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index cd4bd42..b7dc335 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1516,8 +1516,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
1516 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) | 1516 | if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) |
1517 | { | 1517 | { |
1518 | // VolumeDetect can't be set via UI and will always be off when a change is made there | 1518 | // VolumeDetect can't be set via UI and will always be off when a change is made there |
1519 | if (PhysData.PhysShapeType == PhysShapeType.invalid) | 1519 | // now only change volume dtc if phantom off |
1520 | group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false); | 1520 | |
1521 | if (PhysData.PhysShapeType == PhysShapeType.invalid) // check for extraPhysics data | ||
1522 | { | ||
1523 | bool vdtc; | ||
1524 | if (SetPhantom) // if phantom keep volumedtc | ||
1525 | vdtc = group.RootPart.VolumeDetectActive; | ||
1526 | else // else turn it off | ||
1527 | vdtc = false; | ||
1528 | |||
1529 | group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, vdtc); | ||
1530 | } | ||
1521 | else | 1531 | else |
1522 | { | 1532 | { |
1523 | SceneObjectPart part = GetSceneObjectPart(localID); | 1533 | SceneObjectPart part = GetSceneObjectPart(localID); |