diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-03-10 13:06:06 -0700 |
| commit | 34c12d009c232917732e6eeb452da7e76b2ee12e (patch) | |
| tree | 847155313ac7588a23f3ee71d3ee8f3ab30580c9 /indra/newview/llselectmgr.cpp | |
| parent | 7b9817cbcc5acab58d9d4355984b429850bd3ef8 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 7b397d46f3..c83b459279 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -6187,8 +6187,8 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; if (shader) - { //switch to "solid color" program for SH-2690 -- works around driver bug causing bad triangles when rendering silhouettes - gSolidColorProgram.bind(); + { //use UI program for selection highlights (texture color modulated by vertex color) + gUIProgram.bind(); } gGL.matrixMode(LLRender::MM_MODELVIEW); @@ -6243,10 +6243,11 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); gGL.begin(LLRender::LINES); { + gGL.color4f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], 0.4f); + for(S32 i = 0; i < mSilhouetteVertices.size(); i += 2) { u_coord += u_divisor * LLSelectMgr::sHighlightUScale; - gGL.color4f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], 0.4f); gGL.texCoord2f( u_coord, v_coord ); gGL.vertex3fv( mSilhouetteVertices[i].mV); u_coord += u_divisor * LLSelectMgr::sHighlightUScale; |