diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-09 15:04:25 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-09 15:04:25 -0500 |
| commit | 64e017fc6b19006c893b4766be05c18ddb3b5593 (patch) | |
| tree | 2753e519602225e40e74ca53b05f0ba653ad8fc6 /indra/newview/llappviewer.cpp | |
| parent | 04ddae45b284b8f535aa6cdc6b90af2088e82334 (diff) | |
SH-915 WIP - allow flycam control in autopilot record/playback
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llappviewer.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c1a311b170..ec3d775dc7 100644..100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4221,8 +4221,15 @@ void LLAppViewer::idle() } if (LLViewerJoystick::getInstance()->getOverrideCamera()) - { - LLViewerJoystick::getInstance()->moveFlycam(); + { + if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera()) + { + // camera positioning handled inside gAgentPilot. + } + else + { + LLViewerJoystick::getInstance()->moveFlycam(); + } } else { |