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/llappviewer.cpp | |
| parent | 29ea62811fff865c05c67b26a2dc8d2da966c5d0 (diff) | |
SH-915 WIP - removed coupling between autopilot flycam and joystick flycam
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
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 { |