diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
| commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
| tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/newview/lldrawpoolavatar.cpp | |
| parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
| parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) | |
Merge pull from vir/drano
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)); |