diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-13 10:29:52 -0400 |
| commit | 4046e0801ba4f7a01311de06b110177630ea6e04 (patch) | |
| tree | 47ad154496cb50ef39617cf1b9ddc147d1358076 /indra/newview/llagent.cpp | |
| parent | 40325a7347a059f913e01b449c924b13d1471e23 (diff) | |
| parent | 8017900e7f536663153451ff788d8662427782ed (diff) | |
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 f4023502f6..9ff329aa05 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(); |