diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-10-10 18:00:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-10-10 18:00:11 -0500 |
| commit | e43058e7640bbdb8507e153bf63a5e6adb016101 (patch) | |
| tree | 2b0cfde66d85573f22ab0f85f02f011b07bdbc61 /indra/llappearance/lltexlayer.cpp | |
| parent | 275a9606e8658592cc08bcb69ae6a867c008e7ed (diff) | |
MAINT-2968 Fix for crash on AMD hardware running current drivers.
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index f951a982e5..a3a8616864 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1123,7 +1123,10 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height) // *TODO: Is this correct? //gPipeline.disableLights(); stop_glerror(); - glDisable(GL_LIGHTING); + if (!LLGLSLShader::sNoFixedFunction) + { + glDisable(GL_LIGHTING); + } stop_glerror(); bool use_shaders = LLGLSLShader::sNoFixedFunction; |