diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-10 10:28:58 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-10 10:28:58 -0500 |
| commit | 1a39a8f7d953a28b03bad0921a8877e21e1e2c61 (patch) | |
| tree | f586c675b9a575fe5b46a1b94ea2555023289169 /indra/newview/llviewerwindow.cpp | |
| parent | 214d8d40c12c0a39dffdd837c861abe4c005caf1 (diff) | |
| parent | 7c561ca1c7732d1d95562069565f605f46e8c9e3 (diff) | |
Merge branch 'DRTVWR-546' into glthread
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 7dc7b33938..a35ad55cf7 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1903,7 +1903,7 @@ LLViewerWindow::LLViewerWindow(const Params& p) p.title, p.name, p.x, p.y, p.width, p.height, 0, p.fullscreen, gHeadlessClient, - gSavedSettings.getBOOL("DisableVerticalSync"), + gSavedSettings.getBOOL("RenderVSyncEnable"), !gHeadlessClient, p.ignore_pixel_depth, gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled @@ -5569,7 +5569,7 @@ void LLViewerWindow::restartDisplay(BOOL show_progress_bar) } } -BOOL LLViewerWindow::changeDisplaySettings(LLCoordScreen size, BOOL disable_vsync, BOOL show_progress_bar) +BOOL LLViewerWindow::changeDisplaySettings(LLCoordScreen size, BOOL enable_vsync, BOOL show_progress_bar) { //BOOL was_maximized = gSavedSettings.getBOOL("WindowMaximized"); |