summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-04 09:38:06 -0500
committerOz Linden <oz@lindenlab.com>2013-02-04 09:38:06 -0500
commit68ec77127b158f0abffb6160eb7d870c85b278ad (patch)
treead43a05bb4a45449d27f4c077ef8ca653f35d7b9 /indra/llrender/llshadermgr.cpp
parent19233999edfd143d0e7f8e3743dc07455d206172 (diff)
parent7cc7ae873c5aeca9b5939176fb70677365e25395 (diff)
merge tonyas loop fixes
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r--indra/llrender/llshadermgr.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index e52411ebe5..9b2874c79d 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1124,6 +1124,9 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedUniforms.push_back("global_gamma");
mReservedUniforms.push_back("texture_gamma");
+
+ mReservedUniforms.push_back("specular_color");
+ mReservedUniforms.push_back("env_intensity");
llassert(mReservedUniforms.size() == END_RESERVED_UNIFORMS);