Merged in euclid-wip-SL12594 (pull request #5)

SL-12594, missed occurance of VertexShaderEnable setting

Approved-by: Michael Pohoreski <ptolemy@lindenlab.com>
Approved-by: Bradley Payne <vir@lindenlab.com>

1 files changed, 0 insertions, 9 deletions

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);