diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-11 13:19:49 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-11 13:19:49 -0500 |
| commit | d381ec420972722cc176910b4d9e2f7ecf45288a (patch) | |
| tree | 799e72b14d3705b1cd795aaa48ef5a86a7451ac4 /indra/newview/llagentpilot.cpp | |
| parent | 29ea62811fff865c05c67b26a2dc8d2da966c5d0 (diff) | |
SH-915 WIP - removed coupling between autopilot flycam and joystick flycam
Diffstat (limited to 'indra/newview/llagentpilot.cpp')
| -rwxr-xr-x | indra/newview/llagentpilot.cpp | 6 |
1 files changed, 0 insertions, 6 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; |