diff options
author | Diva Canto | 2009-09-29 16:13:31 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-29 16:13:31 -0700 |
commit | 89016203de20b6384dcc2cd36c84dff083d81d5a (patch) | |
tree | 65b01dc893ff4364503903d814f0ba9e19d93478 /OpenSim/Region | |
parent | Minor bug fixes. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim (diff) | |
download | opensim-SC_OLD-89016203de20b6384dcc2cd36c84dff083d81d5a.zip opensim-SC_OLD-89016203de20b6384dcc2cd36c84dff083d81d5a.tar.gz opensim-SC_OLD-89016203de20b6384dcc2cd36c84dff083d81d5a.tar.bz2 opensim-SC_OLD-89016203de20b6384dcc2cd36c84dff083d81d5a.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
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 |