aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-04 01:22:01 +0100
committerJustin Clark-Casey (justincc)2011-08-04 01:22:01 +0100
commit831f933ce63eb8cf2bb24c1258ae5aeff394740f (patch)
tree01473346e13373a5dcfe6e976cb77c5ba53be849
parentmove reset code out of HandleMoveToTargetUpdate() so that we only call it whe... (diff)
downloadopensim-SC_OLD-831f933ce63eb8cf2bb24c1258ae5aeff394740f.zip
opensim-SC_OLD-831f933ce63eb8cf2bb24c1258ae5aeff394740f.tar.gz
opensim-SC_OLD-831f933ce63eb8cf2bb24c1258ae5aeff394740f.tar.bz2
opensim-SC_OLD-831f933ce63eb8cf2bb24c1258ae5aeff394740f.tar.xz
only call move target code in SP.HandleAgentUpdate() if we're actually in the process of moving to a position
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs21
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
1484 i++; 1484 i++;
1485 } 1485 }
1486 1486
1487 // If the user has pressed a key then we want to cancel any move to target. 1487 if (m_moveToPositionInProgress)
1488 if (DCFlagKeyPressed && m_moveToPositionInProgress)
1489 { 1488 {
1490 ResetMoveToTarget(); 1489 // If the user has pressed a key then we want to cancel any move to target.
1491 update_movementflag = true; 1490 if (DCFlagKeyPressed)
1492 } 1491 {
1493 else 1492 ResetMoveToTarget();
1494 {
1495 if (HandleMoveToTargetUpdate(
1496 ref agent_control_v3, bodyRotation, bAllowUpdateMoveToPosition))
1497 update_movementflag = true; 1493 update_movementflag = true;
1494 }
1495 else
1496 {
1497 if (HandleMoveToTargetUpdate(
1498 ref agent_control_v3, bodyRotation, bAllowUpdateMoveToPosition))
1499 update_movementflag = true;
1500 }
1498 } 1501 }
1499 } 1502 }
1500 1503