From b864cecd6c938b18cf05f7695f33f4da3b608a47 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Mon, 13 May 2013 16:34:52 -0700
Subject: De-bork the viewer merge, causing black in-world images.   Reviewed
 by Kelly

---
 indra/llrender/llshadermgr.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llrender/llshadermgr.cpp')

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 825f80a6dc..4893b1d043 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1120,8 +1120,6 @@ void LLShaderMgr::initAttribsAndUniforms()
 
 	mReservedUniforms.push_back("matrixPalette");
 	
-	
-	mReservedUniforms.reserve(12);
 	mReservedUniforms.push_back("screenTex");
 	mReservedUniforms.push_back("screenDepth");
 	mReservedUniforms.push_back("refTex");
-- 
cgit v1.2.3