summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2011-04-29 15:35:22 -0700
committercallum <none@none>2011-04-29 15:35:22 -0700
commit367823ced0cc885474850b4400c7936d667a7d7a (patch)
tree38491857efc91fe937d6fcbb7dac76e990ac41c5 /indra/newview/llagent.cpp
parentf56a2e55ccd86e3739f69c3d8dcc007c337bdaa1 (diff)
EXP-623 FIX Selecting fly option while on click to walk path flys avatar to
end point but avatar spins and shakes when arriving at click point
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7d491a7774..a6d2c96d52 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -62,6 +62,7 @@
#include "llstatusbar.h"
#include "llteleportflags.h"
#include "lltool.h"
+#include "lltoolpie.h"
#include "lltoolmgr.h"
#include "lltrans.h"
#include "llurlentry.h"
@@ -559,6 +560,8 @@ void LLAgent::setFlying(BOOL fly)
// static
void LLAgent::toggleFlying()
{
+ LLToolPie::instance().stopClickToWalk();
+
BOOL fly = !gAgent.getFlying();
gAgent.mMoveTimer.reset();