diff options
author | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:33:59 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-10-09 16:33:59 +0000 |
commit | 0a4ddfffdc2d77a8dc330bcddeda06a505724bfa (patch) | |
tree | ec52a16863ef06980df55ee1a935d93654fe4696 /indra/llrender/llshadermgr.cpp | |
parent | fc5a30a6949e6127a27f9bbadb51a287195145f6 (diff) | |
parent | 8c4258009b09f16751437d0549067ab2950e725a (diff) |
Merged in graham_linden/viewer-eep-graham (pull request #138)
SL-9751 and SL-9709
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 153cef0317..3927632dbe 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1325,6 +1325,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("ice_level"); mReservedUniforms.push_back("rainbow_map"); mReservedUniforms.push_back("halo_map"); + mReservedUniforms.push_back("moon_brightness"); + mReservedUniforms.push_back("moon_phase"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); |