aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-03 00:55:52 +0100
committerJustin Clark-Casey (justincc)2011-08-03 00:55:52 +0100
commit1c126e6e222989dc9ce66e65380d120c7ee8d24d (patch)
tree96f4d971e31374c0742ac5257a48995e01e50f8d
parentrefactor: move out code from HandleAgentUpdate() which processes updates to m... (diff)
downloadopensim-SC-1c126e6e222989dc9ce66e65380d120c7ee8d24d.zip
opensim-SC-1c126e6e222989dc9ce66e65380d120c7ee8d24d.tar.gz
opensim-SC-1c126e6e222989dc9ce66e65380d120c7ee8d24d.tar.bz2
opensim-SC-1c126e6e222989dc9ce66e65380d120c7ee8d24d.tar.xz
refactor: Move update_movement_flag and the final check inside the m_allowMovement if in HandleAgentUpdate() since it's logically only ever used there
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 06b27ca..7cc6d66 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1377,11 +1377,11 @@ namespace OpenSim.Region.Framework.Scenes
1377 { 1377 {
1378 return; 1378 return;
1379 } 1379 }
1380
1381 bool update_movementflag = false;
1382 1380
1383 if (m_allowMovement && !SitGround) 1381 if (m_allowMovement && !SitGround)
1384 { 1382 {
1383 bool update_movementflag = false;
1384
1385 if (agentData.UseClientAgentPosition) 1385 if (agentData.UseClientAgentPosition)
1386 { 1386 {
1387 m_moveToPositionInProgress = (agentData.ClientAgentPosition - AbsolutePosition).Length() > 0.2f; 1387 m_moveToPositionInProgress = (agentData.ClientAgentPosition - AbsolutePosition).Length() > 0.2f;
@@ -1521,10 +1521,10 @@ namespace OpenSim.Region.Framework.Scenes
1521 1521
1522 AddNewMovement(agent_control_v3, q); 1522 AddNewMovement(agent_control_v3, q);
1523 } 1523 }
1524 }
1525 1524
1526 if (update_movementflag && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) && (m_parentID == 0) && !SitGround) 1525 if (update_movementflag && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) && (m_parentID == 0) && !SitGround)
1527 Animator.UpdateMovementAnimations(); 1526 Animator.UpdateMovementAnimations();
1527 }
1528 1528
1529 m_scene.EventManager.TriggerOnClientMovement(this); 1529 m_scene.EventManager.TriggerOnClientMovement(this);
1530 1530