summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-03-05 01:38:49 -0600
committerDave Parks <davep@lindenlab.com>2013-03-05 01:38:49 -0600
commita65c275865f1cc9bf53237e4b8c99a7bee3731ee (patch)
treea03b89ea3766cc6a507b17bfb4a119954df4f97b /indra/newview
parent586025bde53ffcd160a9d169cca328ed5078f5f4 (diff)
Merge cleanup.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewershadermgr.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index dd1325277c..6cd52dc736 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -128,7 +128,6 @@ public:
private:
- UniformVec mShinyUniforms;
// the list of shaders we need to propagate parameters to.
std::vector<LLGLSLShader *> mShaderList;