diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-05 16:36:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-05 16:36:49 -0500 |
| commit | 749b48523aa9d57e9242a18007d49c9e517ea84d (patch) | |
| tree | b5826a6668d980c91a5d0682eeb9631e90a7a45a | |
| parent | de374744294d5d23e1b84a8feb8fa8b5e4e7dc49 (diff) | |
SH-1951 Fix for show land owners not working when basic shaders enabled.
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 84eeace9c6..3daa0f8261 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -143,7 +143,7 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass ) void LLDrawPoolTerrain::endRenderPass( S32 pass ) { LLFastTimer t(FTM_RENDER_TERRAIN); - LLFacePool::endRenderPass(pass); + //LLFacePool::endRenderPass(pass); if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0) { sShader->unbind(); @@ -215,8 +215,10 @@ void LLDrawPoolTerrain::render(S32 pass) { //use fullbright shader for highlighting LLGLSLShader* old_shader = sShader; sShader->unbind(); - sShader = &gObjectFullbrightProgram; + sShader = &gObjectFullbrightNonIndexedProgram; sShader->bind(); + LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL); + glPolygonOffset(-1.0f, -1.0f); renderOwnership(); sShader = old_shader; sShader->bind(); |