merge changes for 2.7.4 release

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/app_settings/shaders/class2/lighting/lightShinyF.glsl b/indra/newview/app_settings/shaders/class2/lighting/lightShinyF.glsl
index ebe21320b4..300fcac092 100644
--- a/indra/newview/app_settings/shaders/class2/lighting/lightShinyF.glsl
+++ b/indra/newview/app_settings/shaders/class2/lighting/lightShinyF.glsl
@@ -5,9 +5,9 @@
  * $/LicenseInfo$
  */
  
-#version 120
 
-uniform sampler2D diffuseMap;
+
+
 uniform samplerCube environmentMap;
 
 vec3 scaleSoftClip(vec3 light);
@@ -16,7 +16,7 @@ vec4 applyWaterFog(vec4 color);
 
 void shiny_lighting()
 {
-	vec4 color = texture2D(diffuseMap, gl_TexCoord[0].xy);
+	vec4 color = diffuseLookup(gl_TexCoord[0].xy);
 	color.rgb *= gl_Color.rgb;
 	
 	vec3 envColor = textureCube(environmentMap, gl_TexCoord[1].xyz).rgb;