diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index d15584d2e1966cd0741f38559b075db67738331e..4f7f845c70be02d3ab2ec58957999c2bae80db10 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -660,11 +660,8 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 	
 	for (std::map<std::string,std::string>::iterator iter = defines.begin(); iter != defines.end(); ++iter)
 	{
-		if (iter->first != "NULL")
-		{
-			std::string define = "#define " + iter->first + " " + iter->second + "\n";
-			text[count++] = (GLcharARB *) strdup(define.c_str());
-		}
+		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)
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 8c0ec4e27575be852ec030a33410127f2ca3d746..e70bf013e7d1f9fe0b917ea00f4c14d54a185175 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -828,7 +828,6 @@ BOOL LLViewerShaderMgr::loadBasicShaders()
 	shaders.push_back( make_pair( "objects/nonindexedTextureV.glsl",		1 ) );
 	
 	std::map<std::string, std::string> attribs;
-	attribs["NULL"] = "0";
 	
 	// We no longer have to bind the shaders to global glhandles, they are automatically added to a map now.
 	for (U32 i = 0; i < shaders.size(); i++)