diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-03 11:28:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-03 11:28:56 -0400 |
| commit | fa6add3fcd300b21142e3381f35851b3404ee02a (patch) | |
| tree | b61b7264e152b2e356393ed9a7fcc7e73a1c6ba7 /indra/newview/lldrawpoolavatar.cpp | |
| parent | caa780e49740e8e9d707ad8ba6a302be8d4d20d9 (diff) | |
| parent | 224217dae82ad5f5127c511de6c7237fa81f36bb (diff) | |
merge changes for drtvwr-132
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)); |