diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-07 16:46:58 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-07 16:46:58 -0600 |
| commit | 1bd09e2e42fbde3f00be2577b719bd172b4c9496 (patch) | |
| tree | d6af380e1e7e849a9c91544a75affa14ae4e79d8 /indra/newview | |
| parent | 92909dae8011400c50f89d88d712398f03d6db0a (diff) | |
SH-2634 Fix for land overlay not showing colors
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 3 |
2 files changed, 4 insertions, 3 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); } diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 3e9d30283a..addb18a1d5 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -244,8 +244,9 @@ void LLDrawPoolTerrain::render(S32 pass) { //use fullbright shader for highlighting LLGLSLShader* old_shader = sShader; sShader->unbind(); - sShader = &gObjectFullbrightNonIndexedProgram; + sShader = &gHighlightProgram; sShader->bind(); + sShader->uniform4f(LLShaderMgr::HIGHLIGHT_COLOR, 1,1,1,1); LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL); glPolygonOffset(-1.0f, -1.0f); renderOwnership(); |