diff options
| author | Richard Linden <none@none> | 2011-05-02 17:29:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-02 17:29:56 -0700 |
| commit | 78d76eb4b01e0bd6db41a67d1573a1b841cbe993 (patch) | |
| tree | cf27f549e75b5aeda2d04c52aed2edca6c619638 /indra/newview/llagent.cpp | |
| parent | 72c43237fc184d07936edbc4f1dbd18d394c4ce9 (diff) | |
| parent | 9edcde56e907d1170fee311304e93449ad617d6a (diff) | |
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.t3awyz\ssh__richard@hg.lindenlab.com_richard_viewer-experience-merge_2xcevh.hg
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(); |