Fix the fix. Child prims were failing to load.

0.6.0-stable
Melanie Thielker 2008-10-11 23:59:46 +00:00
parent 6f2d077356
commit acce65457c
1 changed files with 10 additions and 7 deletions

View File

@ -551,15 +551,18 @@ namespace OpenSim.Region.Environment.Scenes
//}
//m_log.Info("[PART]: OFFSET:" + m_offsetPosition.ToString());
if (_parentID != 0)
if (ParentGroup != null && ParentGroup.RootPart != null)
{
Vector3 resultingposition = GetWorldPosition();
PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z);
Quaternion resultingrot = GetWorldRotation();
PhysActor.Orientation = resultingrot;
if (_parentID != 0)
{
Vector3 resultingposition = GetWorldPosition();
PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z);
Quaternion resultingrot = GetWorldRotation();
PhysActor.Orientation = resultingrot;
// Tell the physics engines that this prim changed.
m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
// Tell the physics engines that this prim changed.
m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
}
}
}
}