From 87a21d8acc859292a6d600d920fea5b24f3763e1 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Fri, 31 Jan 2020 10:29:16 -0700
Subject: SL-12594, fix one missed occurance of VertexShaderEnable setting

---
 indra/newview/llviewershadermgr.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'indra/newview/llviewershadermgr.cpp')

diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index f6f4ac54d4..c8ddc96301 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -692,15 +692,6 @@ void LLViewerShaderMgr::setShaders()
                 setShaders();
                 return;
             }
-
-            if (gSavedSettings.getBOOL("VertexShaderEnable"))
-            { //disable shaders outright and try again
-                gSavedSettings.setBOOL("VertexShaderEnable", FALSE);
-                LL_WARNS() << "Falling back to no vertex shaders." << LL_ENDL;
-                reentrance = false;
-                setShaders();
-                return;
-            }
         }       
 
         llassert(loaded);
-- 
cgit v1.2.3