diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-25 15:07:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-25 15:07:57 -0500 |
| commit | 7dafa1be79f4e3f454ce022326cb09fa5cabb003 (patch) | |
| tree | ada853a78bca98f0cf4ed19d628690e7e2692f9d /indra/newview/llviewershadermgr.cpp | |
| parent | 30d1a2d053fe7d6e0c88928cf51aa73865ee21e8 (diff) | |
SH-2622 Put back "Basic Shaders" toggle ability.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 619a9078be..637cba6d6c 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -363,8 +363,8 @@ void LLViewerShaderMgr::setShaders() reentrance = true; - if (LLRender::sGLCoreProfile || (gGLManager.mGLVersion >= 2.f && !gGLManager.mIsIntel)) - { //ALWAYS use shaders where available (except for intel, intel prefers fixed function) + if (LLRender::sGLCoreProfile) + { if (!gSavedSettings.getBOOL("VertexShaderEnable")) { //vertex shaders MUST be enabled to use core profile gSavedSettings.setBOOL("VertexShaderEnable", TRUE); |