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,17 +1484,20 @@ namespace OpenSim.Region.Framework.Scenes
i++;
}
// If the user has pressed a key then we want to cancel any move to target.
if (DCFlagKeyPressed && m_moveToPositionInProgress)
if (m_moveToPositionInProgress)
{
ResetMoveToTarget();
update_movementflag = true;
}
else
{
if (HandleMoveToTargetUpdate(
ref agent_control_v3, bodyRotation, bAllowUpdateMoveToPosition))
// If the user has pressed a key then we want to cancel any move to target.
if (DCFlagKeyPressed)
{
ResetMoveToTarget();
update_movementflag = true;
}
else
{
if (HandleMoveToTargetUpdate(
ref agent_control_v3, bodyRotation, bAllowUpdateMoveToPosition))
update_movementflag = true;
}
}
}