diff options
author | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
commit | 1300f77fdd48d90d09a05058ffdf10df93092391 (patch) | |
tree | 1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/lldrawpoolavatar.cpp | |
parent | 8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff) | |
parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) |
Merged with viewer-beta
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 b002c11af5..0103373fd2 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1138,6 +1138,8 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) return; } + llassert(LLPipeline::sImpostorRender || !avatarp->isVisuallyMuted()); + /*if (single_avatar && avatarp->mSpecialRenderMode >= 1) // 1=anim preview, 2=image preview, 3=morph view { gPipeline.enableLightsAvatarEdit(LLColor4(.5f, .5f, .5f, 1.f)); |