only call move target code in SP.HandleAgentUpdate() if we're actually in the process of moving to a position

bulletsim
Justin Clark-Casey (justincc) 2011-08-04 01:22:01 +01:00
parent 7b2b47530e
commit 831f933ce6
1 changed files with 12 additions and 9 deletions

View File

@ -1484,8 +1484,10 @@ namespace OpenSim.Region.Framework.Scenes
i++; i++;
} }
if (m_moveToPositionInProgress)
{
// If the user has pressed a key then we want to cancel any move to target. // If the user has pressed a key then we want to cancel any move to target.
if (DCFlagKeyPressed && m_moveToPositionInProgress) if (DCFlagKeyPressed)
{ {
ResetMoveToTarget(); ResetMoveToTarget();
update_movementflag = true; update_movementflag = true;
@ -1497,6 +1499,7 @@ namespace OpenSim.Region.Framework.Scenes
update_movementflag = true; update_movementflag = true;
} }
} }
}
// Cause the avatar to stop flying if it's colliding // Cause the avatar to stop flying if it's colliding
// with something with the down arrow pressed. // with something with the down arrow pressed.