From af020ad55821ca2b7c21551a2602927a56123db7 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 18 May 2015 15:36:50 -0500 Subject: [PATCH] LLViewerShaderMgr::setShaders() should be called unconditionally upon restoreGL. --- indra/newview/pipeline.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index f58a7faf7..9d6f0e02a 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1206,10 +1206,7 @@ void LLPipeline::restoreGL() { assertInitialized(); - if (LLGLSLShader::sNoFixedFunction) - { - LLViewerShaderMgr::instance()->setShaders(); - } + LLViewerShaderMgr::instance()->setShaders(); for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); iter != LLWorld::getInstance()->getRegionList().end(); ++iter)