diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
| commit | ac1d3a22f2034a5e3aba757bde72825643fa799c (patch) | |
| tree | 420b1e27469931f3017bcbe2e7c6f12f2dbd644b /indra/llappearance/lltexlayer.cpp | |
| parent | 6d405e2d018e6722288e1cfbf477d985b8384a54 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.
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; |