summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-07-19 15:06:56 -0400
committerLogan Dethrow <log@lindenlab.com>2011-07-19 15:06:56 -0400
commit0f501293bdf5498369e5b6e4409cfdc758366d9e (patch)
treee8cd32ff25f2ef00d43a69491a37a3b59f169e85 /indra/newview/llagent.cpp
parent792667ff8ef13e16823d96b490ea9a4f498425ea (diff)
parent4dc0850da7469906e5ad052da71830b05005295b (diff)
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llagent.cpp5
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();