diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-18 12:08:01 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-18 12:08:01 -0400 |
| commit | 5f3194be1dd0cb5b7a7e7f4f6ad496b1b6caa93b (patch) | |
| tree | 70c14a110f92273e6ae5b799a0f847728119054e /indra/newview/llagent.cpp | |
| parent | 67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff) | |
| parent | 771ff8a764c04f05409c46f07e2af666841bc4d3 (diff) | |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x[-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..100755 --- 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(); |