diff options
| author | Tofu Buzzard <no-email> | 2011-02-10 17:26:02 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-10 17:26:02 -0800 |
| commit | 5151f02566ddf708d4d5f5cc3a20954bc3a3a48f (patch) | |
| tree | 92933854693793d8b0850ad2317b8735fd274d3a /indra/newview/llappviewer.cpp | |
| parent | 3738cf241ab547e93c0cd9f0c0250502d93c9092 (diff) | |
| parent | 536e90a2fa037cd669bbdba7be9afb67e394c812 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llappviewer.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c1a311b170..0118d2dfc1 100644..100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -468,8 +468,8 @@ static void settings_to_globals() LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections"); LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius"); - gAgentPilot.mNumRuns = gSavedSettings.getS32("StatsNumRuns"); - gAgentPilot.mQuitAfterRuns = gSavedSettings.getBOOL("StatsQuitAfterRuns"); + gAgentPilot.setNumRuns(gSavedSettings.getS32("StatsNumRuns")); + gAgentPilot.setQuitAfterRuns(gSavedSettings.getBOOL("StatsQuitAfterRuns")); gAgent.setHideGroupTitle(gSavedSettings.getBOOL("RenderHideGroupTitle")); gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc"); @@ -2289,7 +2289,7 @@ bool LLAppViewer::initConfiguration() if (clp.hasOption("replaysession")) { - LLAgentPilot::sReplaySession = TRUE; + gAgentPilot.setReplaySession(TRUE); } if (clp.hasOption("nonotifications")) @@ -4221,8 +4221,15 @@ void LLAppViewer::idle() } if (LLViewerJoystick::getInstance()->getOverrideCamera()) - { - LLViewerJoystick::getInstance()->moveFlycam(); + { + if (gAgentPilot.isPlaying() && gAgentPilot.getOverrideCamera()) + { + gAgentPilot.moveCamera(); + } + else + { + LLViewerJoystick::getInstance()->moveFlycam(); + } } else { |