diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-17 19:29:35 -0800 |
| commit | 3d137bae5c5435dde305323179d8d3d6c9720bad (patch) | |
| tree | 959fe5ab17e21ab6d4455da7f7173270f8d01732 /indra/newview/lldrawpoolavatar.cpp | |
| parent | 6fe7144104cd8b5bd9c7d215f76afdeafe13b7ee (diff) | |
| parent | f8b51f40289255ce38f65830f5bb0f29def3b757 (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -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 730ad1a364..0e15f474c9 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1630,6 +1630,7 @@ void LLDrawPoolAvatar::renderRiggedAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_ALPHA); + gGL.setColorMask(true, false); } } @@ -1646,6 +1647,7 @@ void LLDrawPoolAvatar::renderRiggedFullbrightAlpha(LLVOAvatar* avatar) LLRender::BF_ONE_MINUS_SOURCE_ALPHA); renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA); + gGL.setColorMask(true, false); } } |