summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-07-26 18:38:49 -0500
committerDave Parks <davep@lindenlab.com>2011-07-26 18:38:49 -0500
commitb9b0255272067f127f5967e082fb30ac5408ccef (patch)
treea327a94d056c58670dcae4505d0783f261ed1caa /indra/newview/app_settings/shaders/class1
parentb26ff4b4edd7abd320fb7e200195137bd235a7e4 (diff)
SH-2179 Fix for active UI elements glowing when basic shaders enabled.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
-rw-r--r--indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
index ae943cc438..5b7cc57574 100644
--- a/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/solidcolorF.glsl
@@ -9,7 +9,7 @@ uniform sampler2D tex0;
void main()
{
- float alpha = texture2D(tex0, gl_TexCoord[0].xy).a;
+ float alpha = texture2D(tex0, gl_TexCoord[0].xy).a * gl_Color.a;
gl_FragColor = vec4(gl_Color.rgb, alpha);
}