diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-04-29 16:07:56 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-04-29 16:07:56 -0700 |
| commit | 3d64e29007800488fddacc1008ebec242d189e80 (patch) | |
| tree | b1abda0847edb3ef9d5c8b3c76e9538140a798e1 /indra/newview/llagent.cpp | |
| parent | 5fe3675564f1c7d8cf13e94f43d32be5ea45940b (diff) | |
| parent | af41eb0d2c9f45c545c0470d44b91147e74c82a4 (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 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(); |