OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent b1d204802f 09cb8a594b
commit 89016203de
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

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