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)