diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-09 11:26:24 -0700 |
| commit | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (patch) | |
| tree | d6fafbb1a084ea8b06db3d3499bd5084b7e4f7f6 /indra/newview/llagent.cpp | |
| parent | 26334a4c57e58bfd13e6bbbff2298ec5ba3e77e7 (diff) | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (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 c8306117ba..8f5efcf941 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -67,6 +67,7 @@ #include "llstatusbar.h" #include "llteleportflags.h" #include "lltool.h" +#include "lltoolpie.h" #include "lltoolmgr.h" #include "lltrans.h" #include "llurlentry.h" @@ -573,6 +574,8 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { + LLToolPie::instance().stopClickToWalk(); + BOOL fly = !gAgent.getFlying(); gAgent.mMoveTimer.reset(); |