diff options
| -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(); |