From d381ec420972722cc176910b4d9e2f7ecf45288a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 11 Feb 2011 13:19:49 -0500
Subject: [PATCH] SH-915 WIP - removed coupling between autopilot flycam and
joystick flycam
---
indra/newview/llagentpilot.cpp | 6 ------
indra/newview/llappviewer.cpp | 15 ++++++---------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index f96db0a5df4..734c502fcf6 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 0118d2dfc1b..add0e72ce2d 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
{
--
GitLab