diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-05-16 12:26:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-05-16 12:26:17 -0500 |
| commit | b2141e94465998d13ab4b5d894b0edcdad0e8216 (patch) | |
| tree | cba0541baffa141e9e3e2aecd16ce8cd9457c88c /indra/newview/llviewerwindow.cpp | |
| parent | 3400e5fd302c0d9dea6386c4d5bf38876f2cc287 (diff) | |
| parent | 63095005578007345d9916ebc6855246cdb08c7c (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9bda4bbf92..9c9c30ad95 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1915,12 +1915,6 @@ LLViewerWindow::LLViewerWindow(const Params& p) p.ignore_pixel_depth, gSavedSettings.getBOOL("RenderDeferred") ? 0 : gSavedSettings.getU32("RenderFSAASamples")); //don't use window level anti-aliasing if FBOs are enabled - if (!LLViewerShaderMgr::sInitialized) - { //immediately initialize shaders - LLViewerShaderMgr::sInitialized = TRUE; - LLViewerShaderMgr::instance()->setShaders(); - } - if (NULL == mWindow) { LLSplashScreen::update(LLTrans::getString("StartupRequireDriverUpdate")); @@ -1939,6 +1933,12 @@ LLViewerWindow::LLViewerWindow(const Params& p) #endif LLAppViewer::instance()->fastQuit(1); } + else if (!LLViewerShaderMgr::sInitialized) + { + //immediately initialize shaders + LLViewerShaderMgr::sInitialized = TRUE; + LLViewerShaderMgr::instance()->setShaders(); + } if (!LLAppViewer::instance()->restoreErrorTrap()) { |