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

Another small change to avoid later merge conflict

0.6.8-post-fixes
Kitto Flora 2009-09-30 19:01:55 +02:00
parent 53fbc970ca
commit 6b65eb76d0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3410,7 +3410,8 @@ if (m_shape != null) {
{ {
RemFlag(PrimFlags.Phantom); RemFlag(PrimFlags.Phantom);
if (PhysActor == null) PhysicsActor pa = PhysActor;
if (pa == null)
{ {
// It's not phantom anymore. So make sure the physics engine get's knowledge of it // It's not phantom anymore. So make sure the physics engine get's knowledge of it
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@ -3421,7 +3422,7 @@ if (m_shape != null) {
RotationOffset, RotationOffset,
UsePhysics); UsePhysics);
PhysicsActor pa = PhysActor; pa = PhysActor;
if (pa != null) if (pa != null)
{ {
pa.LocalID = LocalId; pa.LocalID = LocalId;