summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-07 16:46:58 -0600
committerDave Parks <davep@lindenlab.com>2011-11-07 16:46:58 -0600
commit1bd09e2e42fbde3f00be2577b719bd172b4c9496 (patch)
treed6af380e1e7e849a9c91544a75affa14ae4e79d8 /indra/newview/app_settings
parent92909dae8011400c50f89d88d712398f03d6db0a (diff)
SH-2634 Fix for land overlay not showing colors
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/interface/highlightF.glsl4
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 ecbc30f05f..574adeb50c 100644
--- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl
@@ -27,12 +27,12 @@
out vec4 gl_FragColor;
#endif
-uniform vec4 color;
+uniform vec4 highlight_color;
uniform sampler2D diffuseMap;
VARYING vec2 vary_texcoord0;
void main()
{
- gl_FragColor = color*texture2D(diffuseMap, vary_texcoord0.xy);
+ gl_FragColor = highlight_color*texture2D(diffuseMap, vary_texcoord0.xy);
}