diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
| commit | a1c2d021261d38de7dabd0863dd264ac3bf50523 (patch) | |
| tree | 3b09e4412ccac313dd93adff2d14d1c766b5686a /indra/llrender/llshadermgr.cpp | |
| parent | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (diff) | |
| parent | 0a7bc35335666cc310ef900d4e4144c658b92522 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #273)
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
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 3989c1e2e4..11e84d8785 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1352,6 +1352,8 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("sun_moon_glow_factor"); mReservedUniforms.push_back("water_edge"); + mReservedUniforms.push_back("sun_up_factor"); + mReservedUniforms.push_back("moonlight_color"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); |