summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-04 10:56:49 -0500
committerDave Parks <davep@lindenlab.com>2013-06-04 10:56:49 -0500
commit3c2920297e261a4df429037c08eba3f10b16e8c7 (patch)
tree6dfb7733594798188076b22b4bb2ae4ddac9f996 /indra/llrender/llshadermgr.cpp
parent7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff)
parent82bd96a61cb82f75dbb35b1a5e1d9e12eeeffc68 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rwxr-xr-xindra/llrender/llshadermgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 37b9c0e0e0..fea4ee2819 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -977,7 +977,7 @@ void LLShaderMgr::initAttribsAndUniforms()
mReservedAttribs.push_back("texcoord3");
mReservedAttribs.push_back("diffuse_color");
mReservedAttribs.push_back("emissive");
- mReservedAttribs.push_back("binormal");
+ mReservedAttribs.push_back("tangent");
mReservedAttribs.push_back("weight");
mReservedAttribs.push_back("weight4");
mReservedAttribs.push_back("clothing");