From a65c275865f1cc9bf53237e4b8c99a7bee3731ee Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 5 Mar 2013 01:38:49 -0600
Subject: [PATCH] Merge cleanup.

---
 indra/newview/llviewershadermgr.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h
index dd1325277c4..6cd52dc7363 100644
--- a/indra/newview/llviewershadermgr.h
+++ b/indra/newview/llviewershadermgr.h
@@ -128,7 +128,6 @@ class LLViewerShaderMgr: public LLShaderMgr
 
 private:
 
-	UniformVec mShinyUniforms;
 	// the list of shaders we need to propagate parameters to.
 	std::vector<LLGLSLShader *> mShaderList;
 
-- 
GitLab