summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-16 15:08:17 -0600
committerDave Parks <davep@lindenlab.com>2011-11-16 15:08:17 -0600
commit986dccbeafa3fe0ddd9a05e0916a414e4abc51d6 (patch)
treeab3e82ebcb3fe0f38c1cd959430d769b454f178c /indra/newview
parent38853ffdda5eafee6724177d080fd017265044d0 (diff)
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llselectmgr.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 830a7778ac..036e428415 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5713,6 +5713,14 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
return;
}
+
+ LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr;
+
+ if (shader)
+ {
+ gSolidColorProgram.bind();
+ }
+
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();
gGL.pushUIMatrix();
@@ -5835,6 +5843,11 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
}
gGL.popMatrix();
gGL.popUIMatrix();
+
+ if (shader)
+ {
+ shader->bind();
+ }
}
//