diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 16:12:33 -0400 |
| commit | dbac37dcb50bf44255c2b622d418bb4339f1afca (patch) | |
| tree | acffbcb5984696e507243f939f6b9c5a951b755b /indra/newview/lldrawpoolavatar.cpp | |
| parent | 790dfda43472da75d17a848eb91e2dcecb2b96e7 (diff) | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
merge latest viewer-release
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)); |