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/llappviewer.cpp | |
| parent | a44b1ff511cb8f3399aa318ac15019ad97938c45 (diff) | |
| parent | 547293305bdc6c345f52519db514bb5be34c72ef (diff) | |
Merge
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 { |