diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-12-05 18:27:44 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-12-05 18:27:44 -0600 |
| commit | 8964d1754f44f2204269a7ee09d590470bedb8a5 (patch) | |
| tree | 762a7680164221190ea4b69e51db1af4409dd038 /indra/newview | |
| parent | 1273dbfdd9f2a3fa027e6f05c8f811d9fe146ff4 (diff) | |
| parent | 40ec967428575f86a6ebb6acdcf49588820a2a18 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 96718f5c9a..2461acf197 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1654,6 +1654,7 @@ void LLDrawPoolAvatar::renderRiggedAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_ALPHA); + gGL.setColorMask(true, false); } } @@ -1670,6 +1671,7 @@ void LLDrawPoolAvatar::renderRiggedFullbrightAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA); + gGL.setColorMask(true, false); } } |