Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/

--HG--
branch : avatar-pipeline
master
Nyx (Neal Orman) 2009-12-04 15:42:50 -05:00
commit 66bf4246ca
1 changed files with 0 additions and 9 deletions

View File

@ -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);