Fix artifacts from local stash merge.

2013-10-26 19:58:54 -05:00
parent 6474568125
commit 5e8c7264da
3 changed files with 4 additions and 44 deletions
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -676,6 +676,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		std::string define = "#define " + iter->first + " " + iter->second + "\n";
 		text[count++] = (GLcharARB *) strdup(define.c_str());
 	}
+	}

 	if (texture_index_channels > 0 && type == GL_FRAGMENT_SHADER_ARB)
 	{