From 55f11fdfd17bdd3d9d0944940c62507741ac6a7b Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 8 Jul 2011 17:02:15 -0400
Subject: Fix for sh-1637 and sh-1638

---
 indra/newview/llagent.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 446ded8096..a8918877f9 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -575,7 +575,10 @@ void LLAgent::setFlying(BOOL fly)
 // static
 void LLAgent::toggleFlying()
 {
-	LLToolPie::instance().stopClickToWalk();
+	if ( gAgent.mAutoPilot )
+	{
+		LLToolPie::instance().stopClickToWalk();
+	}
 
 	BOOL fly = !gAgent.getFlying();
 
-- 
cgit v1.2.3