summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-22 16:51:42 -0700
committersimon <none@none>2013-05-22 16:51:42 -0700
commit473474b94969799d2835191072c5bca1b7d431d8 (patch)
treea30e59d28262c0b122027bead5636e032287ccda /indra/newview/llselectmgr.cpp
parente5bdb0f0e1b3c48173e36b54da0f25c7d535df49 (diff)
Revert changes for MAINT-2616 due to licensing issues, need a full patch
submitted to be acceptable
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rwxr-xr-xindra/newview/llselectmgr.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 02ace86b95..4681efd3e5 100755
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6051,15 +6051,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
if (shader)
{ //switch to "solid color" program for SH-2690 -- works around driver bug causing bad triangles when rendering silhouettes
- if(gGLManager.mIsIntel)
- {
- gSolidColorProgramIntel.bind();
- gGL.diffuseColor4fv(color.mV);
- }
- else
- {
- gSolidColorProgram.bind();
- }
+ gSolidColorProgram.bind();
}
gGL.matrixMode(LLRender::MM_MODELVIEW);