diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-11 13:47:12 -0400 |
| commit | 353d2059fc33174010127863a25983b918115361 (patch) | |
| tree | f2e08370b140352957b4d7757e59e0fe673f5a14 /indra/newview/llagent.cpp | |
| parent | 7610c0c050a84ebdf08b8e206eb7fe5e190dedb2 (diff) | |
| parent | d86eb3dd42d39e6b7647b6680100aeafe2173d36 (diff) | |
merge up to latest viewer-development
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 fc5529cd59..cb3c5319c9 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -64,6 +64,7 @@ #include "llstatusbar.h" #include "llteleportflags.h" #include "lltool.h" +#include "lltoolpie.h" #include "lltoolmgr.h" #include "lltrans.h" #include "llurlentry.h" @@ -562,6 +563,8 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { + LLToolPie::instance().stopClickToWalk(); + BOOL fly = !gAgent.getFlying(); gAgent.mMoveTimer.reset(); |