diff options
| author | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-03 15:00:49 -0700 |
| commit | 29a2e3f2a4cf7c57adb7a6bfcd71ac960867288d (patch) | |
| tree | ab676a02a67a9838183bdd6239b41252fc34d058 /indra/newview/llagent.cpp | |
| parent | 315eee3a7c87c5ee2154013d3fa0356c80bfab2e (diff) | |
| parent | d5faa4f38d338777463b7ad6eb3239041d43fe28 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
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(); |