diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
| commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
| tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/llrender/llrender.cpp | |
| parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 11d9ef3f57..d515fc707a 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -871,10 +871,10 @@ void LLTexUnit::setTextureColorSpace(eTextureColorSpace space) } } else -#endif { glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); } +#endif } LLLightState::LLLightState(S32 index) |