Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

0.6.8-post-fixes
Diva Canto 2009-09-29 16:13:31 -07:00
commit 89016203de
1 changed files with 1 additions and 1 deletions

View File

@ -3455,6 +3455,7 @@ if (m_shape != null) {
RotationOffset,
UsePhysics);
pa = PhysActor;
if (pa != null)
{
pa.LocalID = LocalId;
@ -3513,7 +3514,6 @@ if (m_shape != null) {
AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
this.VolumeDetectActive = true;
}
}
else
{ // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like