diff options
| author | leyla_linden <none@none> | 2011-02-14 16:32:36 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-14 16:32:36 -0800 |
| commit | 9fcc8c3161986a7eb8052aaf353a2a4d2e6974f5 (patch) | |
| tree | 2a4d6b8fe1f7255323e84d269575fe34bec39df2 /indra/newview/llagentpilot.cpp | |
| parent | a44b1ff511cb8f3399aa318ac15019ad97938c45 (diff) | |
| parent | 547293305bdc6c345f52519db514bb5be34c72ef (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; |