SH-915 WIP - removed coupling between autopilot flycam and joystick flycam

2 files changed, 6 insertions, 15 deletions

diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index f96db0a5df..734c502fcf 100755
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -35,7 +35,6 @@
 #include "llappviewer.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
-#include "llviewerjoystick.h"
 #include "llsdserialize.h"
 #include "llsdutil_math.h"
 
@@ -259,11 +258,6 @@ void LLAgentPilot::startPlayback()
 		if (mActions.count())
 		{
 			llinfos << "Starting playback, moving to waypoint 0" << llendl;
-			if (getOverrideCamera() &&
-				!LLViewerJoystick::getInstance()->getOverrideCamera())	
-			{
-				LLViewerJoystick::getInstance()->toggleFlycam();
-			}
 			gAgent.startAutoPilotGlobal(mActions[0].mTarget);
 			moveCamera();
 			mStarted = FALSE;
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0118d2dfc1..add0e72ce2 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4220,16 +4220,13 @@ void LLAppViewer::idle()
 		LLWorld::getInstance()->updateParticles();
 	}
 
-	if (LLViewerJoystick::getInstance()->getOverrideCamera())
+	if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera())
+	{
+		gAgentPilot.moveCamera();
+	}
+	else if (LLViewerJoystick::getInstance()->getOverrideCamera())
 	{ 
-		if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera())
-		{
-			gAgentPilot.moveCamera();
-		}
-		else
-		{
-			LLViewerJoystick::getInstance()->moveFlycam();
-		}
+		LLViewerJoystick::getInstance()->moveFlycam();
 	}
 	else
 	{