diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-10-26 18:41:26 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-10-26 18:41:26 +0000 |
| commit | c27d0874bc292738fc5efb8c90a6379a7829a646 (patch) | |
| tree | 704ad32fb1d02a41c62aedbc0da7e817e2ea2d3c /indra/newview | |
| parent | b07f5e6c4d5c5ff9e3f58b98565e548d1e2563a5 (diff) | |
Fix for DEV-39996 / EXT-942. Avatar hair and eyelashes had lost partial transparency.
-Reviewed by nyx (simpler xml fix for hair suggested by him as well)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/character/avatar_lad.xml | 7 | ||||
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index f3bfa37cea..c43ba27984 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -5589,6 +5589,13 @@ </layer> <layer + name="hair texture alpha layer" + visibility_mask="TRUE"> + <texture + local_texture="hair_grain" /> + </layer> + + <layer name="hair alpha" visibility_mask="TRUE"> <texture diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 17547cae39..5d9046ac90 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -804,8 +804,9 @@ void LLTexLayerSet::renderAlphaMaskTextures(S32 x, S32 y, S32 width, S32 height, gGL.setColorMask(false, true); gGL.setSceneBlendType(LLRender::BT_REPLACE); + // (Optionally) replace alpha with a single component image from a tga file. - if (!info->mStaticAlphaFileName.empty() && mMaskLayerList.empty()) + if (!info->mStaticAlphaFileName.empty()) { LLGLSNoAlphaTest gls_no_alpha_test; gGL.flush(); |