diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-12-18 18:25:47 -0500 |
| commit | 3c521d8207092f1c48e158082b88c5e81cc9c440 (patch) | |
| tree | 36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/llappearance | |
| parent | 74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff) | |
| parent | 1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff) | |
viewer-release merge
Diffstat (limited to 'indra/llappearance')
| -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; |