diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
| commit | f076bdf609ec1fe114a7d0222a318483c97c7a26 (patch) | |
| tree | 93dbd2a949d60daaf6aaa025ca7cf036cf90a929 /indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | |
| parent | f302e119627090c22325df59c40e1762402a08c6 (diff) | |
| parent | b9439ac006ac64179180ec2a47f6bd92468de455 (diff) | |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/highlightF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl index f6c6d945de..a0cbdaafb8 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -6,10 +6,10 @@ */ - +uniform vec4 highlight_color; uniform sampler2D diffuseMap; void main() { - gl_FragColor = gl_Color*texture2D(diffuseMap, gl_TexCoord[0].xy); + gl_FragColor = highlight_color*texture2D(diffuseMap, gl_TexCoord[0].xy); } |