summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
commitdb85ed33e03c81b69ec020f6daf302bc2478163e (patch)
treea2c47fdda14579beabf33a660b7c522076b93f33 /indra/llrender/llshadermgr.cpp
parent50689a13baf07bcd68bfb77b111b066da972f076 (diff)
parentedf0a0c7f5dcfee2010447bc877515b70d1b1059 (diff)
MErge
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");