Move a check for null PhysActor in applyImpulse so that attachments can move avatars.
Fixes Mantis #31600.6.5-rc1
parent
14b94b8d05
commit
2d387c25b8
|
@ -1513,8 +1513,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// Make sure we don't do that!
|
||||
SceneObjectPart rootpart = m_rootPart;
|
||||
if (rootpart != null)
|
||||
{
|
||||
if (rootpart.PhysActor != null)
|
||||
{
|
||||
if (IsAttachment)
|
||||
{
|
||||
|
@ -1525,6 +1523,8 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (rootpart.PhysActor != null)
|
||||
{
|
||||
rootpart.PhysActor.AddForce(impulse, true);
|
||||
m_scene.PhysicsScene.AddPhysicsActorTaint(rootpart.PhysActor);
|
||||
|
|
Loading…
Reference in New Issue