diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-13 17:45:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-13 17:45:06 -0400 |
| commit | 4d432251e44b4e6377d0edb45a83404e848155a3 (patch) | |
| tree | 4b5117c0d6659fd767caaf56f0d27c689e6a0444 /indra/newview | |
| parent | 1f369cad59c1c2d5bfcf155ef86c887b1b40a0db (diff) | |
| parent | a6a0d5dda70de972ca1e386534284e2e93f29903 (diff) | |
merge changes for storm-1507
Diffstat (limited to 'indra/newview')
| -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(); |