diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-12 13:42:51 -0700 |
| commit | 00c5628074dff2a687d737bc30e9dbe2a1ccfbf8 (patch) | |
| tree | ad6819435b956dee23c6463d69fe26caa89d912d /indra/newview/llagent.cpp | |
| parent | 11f988cd09daa8f33a21b7f82201e4b59e8a04ad (diff) | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
Merge lindenlab/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 aea4e78436..7319c0d902 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(); |