diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 21:44:23 +0000 |
| commit | fc5a30a6949e6127a27f9bbadb51a287195145f6 (patch) | |
| tree | 182ada6abf5bc3655bee7647883b2659aa12b9a1 /indra/llrender/llshadermgr.cpp | |
| parent | b030d7036f87d30babb4a8df8d256113f46182e9 (diff) | |
| parent | 5eed233618abd7020e130799be2abe0f986543f6 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #134)
SL-1925
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 3c25d6aaa8..153cef0317 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1320,6 +1320,11 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("irradiance_texture"); mReservedUniforms.push_back("blend_factor"); mReservedUniforms.push_back("no_atmo"); + mReservedUniforms.push_back("moisture_level"); + mReservedUniforms.push_back("droplet_radius"); + mReservedUniforms.push_back("ice_level"); + mReservedUniforms.push_back("rainbow_map"); + mReservedUniforms.push_back("halo_map"); llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS); |