diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-15 16:26:15 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-15 16:26:15 -0700 |
| commit | 14a06fd1c843c033bd670fad4f6b83d18d5107c1 (patch) | |
| tree | 33adf2829ce51427f6edbd24d4fbbef21215cd11 /indra/newview | |
| parent | 5f99d30c20bd4e23d17bbf78d2112f21ee840169 (diff) | |
| parent | fc5aaf5df8d3b064c05539c7b6911a4c3f4dc1c7 (diff) | |
Merge for STORM-1482
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(); |