diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-14 16:57:42 -0500 |
| commit | 4e006b0e3891d5728a6753059f2c5afc77737482 (patch) | |
| tree | 96af37ac252d823f8dc51e20546848ad464e0274 /indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (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 a3cb5225ba..3a48205101 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -24,10 +24,10 @@ */ - +uniform vec4 color; uniform sampler2D diffuseMap; void main() { - gl_FragColor = gl_Color*texture2D(diffuseMap, gl_TexCoord[0].xy); + gl_FragColor = color*texture2D(diffuseMap, gl_TexCoord[0].xy); } |