diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-29 13:32:51 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-07-29 13:32:51 -0400 |
commit | fb9f092972c915ff77b3866dae302e3433b46224 (patch) | |
tree | 03d970b890a2cd6a4f10e5d90e01fe8ed66ce3b1 /indra/newview/llagent.cpp | |
parent | ad96a4ef4706ae39d259281dd993a52034946425 (diff) | |
parent | 0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (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(); |