diff options
author | Rider Linden <rider@lindenlab.com> | 2018-09-14 21:48:47 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-09-14 21:48:47 +0000 |
commit | 636839a47c6881b10d676d19c65d6c34a956622a (patch) | |
tree | 7e9bfa4e4490b60908df54f6572b964c4e3a3b3a /indra/llrender/llshadermgr.cpp | |
parent | 6298f0b0e3aa8c9d5b71a1c5b26a3232c25601cc (diff) | |
parent | 1df7760d315430766bba44d4d4c64480b4a6138f (diff) |
Merged in graham_linden/viewer-eep-graham (pull request #88)
SL-9632
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r-- | indra/llrender/llshadermgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 78aed5eef6..3c25d6aaa8 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1319,6 +1319,7 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("single_mie_scattering_texture"); mReservedUniforms.push_back("irradiance_texture"); mReservedUniforms.push_back("blend_factor"); + mReservedUniforms.push_back("no_atmo"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); |