diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-15 14:10:38 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-15 14:10:38 -0400 |
| commit | 0e2291535298ca90ae994ce8e2e56836aaa707bc (patch) | |
| tree | 407a616bd39719ace97200eecec097512899d5ec /indra/newview/llagent.cpp | |
| parent | fde88ae24d1093fd0f24fe9cfd66dc05a0d1c51f (diff) | |
| parent | a89c58f01bac2bc0bafc69dc31eb6071b6ef8829 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 8954937f69..492cfe7c1b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -577,7 +577,10 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { - LLToolPie::instance().stopClickToWalk(); + if ( gAgent.mAutoPilot ) + { + LLToolPie::instance().stopClickToWalk(); + } BOOL fly = !gAgent.getFlying(); |