From 367823ced0cc885474850b4400c7936d667a7d7a Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 29 Apr 2011 15:35:22 -0700
Subject: EXP-623 FIX Selecting fly option while on click to walk path flys
 avatar to end point but avatar spins and shakes when arriving at click point

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

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7d491a7774..a6d2c96d52 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -62,6 +62,7 @@
 #include "llstatusbar.h"
 #include "llteleportflags.h"
 #include "lltool.h"
+#include "lltoolpie.h"
 #include "lltoolmgr.h"
 #include "lltrans.h"
 #include "llurlentry.h"
@@ -559,6 +560,8 @@ void LLAgent::setFlying(BOOL fly)
 // static
 void LLAgent::toggleFlying()
 {
+	LLToolPie::instance().stopClickToWalk();
+
 	BOOL fly = !gAgent.getFlying();
 
 	gAgent.mMoveTimer.reset();
-- 
cgit v1.2.3