diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
commit | 7ffc8b45e2cee4389d3b9f3c20ae213e6430d57b (patch) | |
tree | 2095b3a3d55990e7a534fee31226c3caa096c699 /indra/newview/llselectmgr.cpp | |
parent | f40d2c5afb78f4a17b4753c42f6756dbd76a18c8 (diff) | |
parent | 2b40cbb13d03d2e55eb7540f5f59856fb3e6a9cc (diff) |
merge changes for storm-1564
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 8fa4065fa6..26b2b0f5c3 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5123,7 +5123,6 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) gGL.getTexUnit(0)->bind(mSilhouetteImagep); LLGLSPipelineSelection gls_select; - gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f); LLGLEnable blend(GL_BLEND); LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); @@ -5250,7 +5249,6 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) } gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point) |