Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl

@@ -34,4 +34,4 @@ float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n,
 {
     collectedColor = vec4(0);
     return 0;
-}
+}
\ No newline at end of file

indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl

@@ -231,4 +231,4 @@ float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n,
     }
 
     return min(float(hits), 1.0) * vignette;
-}
+}
\ No newline at end of file