Merged in graham_linden/viewer-eep-fixes (pull request #332)

SL-10856

2 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
index f73fc0079b..800070c01d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
@@ -66,8 +66,8 @@ void main()
     outColor = applyWaterFogView(pos.xyz, outColor);
 #endif
 
-    frag_data[0] = vec4(outColor.rgb, 1.0);
-    frag_data[1] = vec4(0.66,0.86,0.66,0.05f);
+    frag_data[0] = vec4(outColor.rgb, 0.0);
+    frag_data[1] = vec4(0.0,0.0,0.0,0.0);
     vec3 nvn = normalize(vary_normal);
     frag_data[2] = vec4(encode_normal(nvn.xyz), 0.0, 0.0);
 }
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 28248aaf6d..c34bac79dd 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -168,8 +168,6 @@ void main()
             col = fogged.rgb;
             bloom = fogged.a;
         #endif
-
-//col.rgb = a;
     }
     frag_color.rgb = col.rgb;
     frag_color.a = bloom;