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

1 files changed, 12 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d471414..bb15a45 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -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;
+                        }
                     }
                 }