diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index ebe68607f..b9abb48ef 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -610,9 +610,10 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 			text[count++] = strdup("#define ATTRIBUTE attribute\n");
 			text[count++] = strdup("#define VARYING varying\n");
 			text[count++] = strdup("#define VARYING_FLAT varying\n");
-			// Need to enable the GL_ARB_texture_rectangle extension here instead of in the shader files,
+			// Need to enable extensions here instead of in the shader files,
 			// before any non-preprocessor directives (per spec)
 			text[count++] = strdup("#extension GL_ARB_texture_rectangle : enable\n");
+			text[count++] = strdup("#extension GL_ARB_shader_texture_lod : enable\n");
 		}
 		else if (minor_version <= 29)
 		{
@@ -623,9 +624,10 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 			text[count++] = strdup("#define ATTRIBUTE attribute\n");
 			text[count++] = strdup("#define VARYING varying\n");
 			text[count++] = strdup("#define VARYING_FLAT varying\n");
-			// Need to enable the GL_ARB_texture_rectangle extension here instead of in the shader files,
+			// Need to enable extensions here instead of in the shader files,
 			// before any non-preprocessor directives (per spec)
 			text[count++] = strdup("#extension GL_ARB_texture_rectangle : enable\n");
+			text[count++] = strdup("#extension GL_ARB_shader_texture_lod : enable\n");
 		}
 	}
 	else
@@ -634,10 +636,11 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		{
 			//set version to 1.30
 			text[count++] = strdup("#version 130\n");
-			
-			// Need to enable the GL_ARB_texture_rectangle extension here instead of in the shader files,
+			// Need to enable extensions here instead of in the shader files,
 			// before any non-preprocessor directives (per spec)
 			text[count++] = strdup("#extension GL_ARB_texture_rectangle : enable\n");
+			text[count++] = strdup("#extension GL_ARB_shader_texture_lod : enable\n");
+			
 
 			//some implementations of GLSL 1.30 require integer precision be explicitly declared
 			text[count++] = strdup("precision mediump int;\n");
@@ -646,9 +649,10 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		else
 		{ //set version to 400
 			text[count++] = strdup("#version 400\n");
-			// Need to enable the GL_ARB_texture_rectangle extension here instead of in the shader files,
+			// Need to enable extensions here instead of in the shader files,
 			// before any non-preprocessor directives (per spec)
 			text[count++] = strdup("#extension GL_ARB_texture_rectangle : enable\n");
+			text[count++] = strdup("#extension GL_ARB_shader_texture_lod : enable\n");
 		}
 		
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
index 5eb9db585..13409832a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
@@ -23,8 +23,8 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
+//#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_shader_texture_lod : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
index 0e6ab80d4..2e01174e3 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
@@ -31,8 +31,8 @@ out vec4 frag_color;
 
 //class 1 -- no shadows
 
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
+//#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_shader_texture_lod : enable
 
 uniform sampler2DRect diffuseRect;
 uniform sampler2DRect specularRect;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index 126f17fab..690744352 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_texture_rectangle : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index edab4d4e8..d64cc4c1a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -23,8 +23,8 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
+//#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_shader_texture_lod : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
diff --git a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl
index 942c5888e..e7a59af2f 100644
--- a/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/downsampleDepthRectF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_texture_rectangle : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
index ac5b7d676..fdb10b151 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
@@ -23,8 +23,8 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
+//#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_shader_texture_lod : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
index 7689b72d2..09881d9d7 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
@@ -23,8 +23,8 @@
  * $/LicenseInfo$
  */
  
-#extension GL_ARB_texture_rectangle : enable
-#extension GL_ARB_shader_texture_lod : enable
+//#extension GL_ARB_texture_rectangle : enable
+//#extension GL_ARB_shader_texture_lod : enable
 
 #ifdef DEFINE_GL_FRAGCOLOR
 out vec4 frag_color;