summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-03 16:05:14 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-03 16:05:14 -0500
commit4dd8d2ccb60485b0f59133ed417899d689a18ce5 (patch)
tree2f7537dffeb8a3cfa6058585af0508a082194ecd
parenta9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff)
parent94d77ac20f8075b5cab992b93901eeecd1e47255 (diff)
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
--HG-- branch : avatar-pipeline
-rw-r--r--indra/newview/llvoavatar.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index a9194c0c3b..db450939b9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3834,15 +3834,6 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
}
- bool should_alpha_mask = shouldAlphaMask();
-
- LLGLState test(GL_ALPHA_TEST, should_alpha_mask);
-
- if (should_alpha_mask)
- {
- gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
- }
-
if (isTextureVisible(TEX_HEAD_BAKED))
{
num_indices += mMeshLOD[MESH_ID_EYELASH]->render(mAdjustedPixelArea, first_pass, mIsDummy);