diff options
| author | Tofu Buzzard <no-email> | 2011-02-11 14:53:40 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-11 14:53:40 -0800 |
| commit | ce1134a54d7fd49f38ec2863366db272ef00f8b0 (patch) | |
| tree | 32a45a0f3a87be02cb58023978f5e4bac09e83c5 /indra/newview/llagentpilot.cpp | |
| parent | 2bc74123de522281955804db63c7806cc4ece415 (diff) | |
| parent | 246b2100e18e6e9e596aacc92a65bd7b6442b0ec (diff) | |
merge
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; |