diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:12:52 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:12:52 -0500 |
| commit | b3fbb12f155ae1acc6b4d258d1c383d5d8e47964 (patch) | |
| tree | 6bc0a1db00daedfb61537ee326fb68dd6252c2bf /indra/newview/lldrawpoolavatar.cpp | |
| parent | 86d6c3f196af3f40bcd4fc62c7828476c7a9d037 (diff) | |
SH-1589 Fix for some meshes showing up in non mesh enabled regions.
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 870aec4eff..9f790d03fe 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -459,14 +459,6 @@ S32 LLDrawPoolAvatar::getNumPasses() { return 10; } - if (LLPipeline::sImpostorRender) - { - return 1; - } - else - { - return 3; - } } @@ -1419,7 +1411,7 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace* void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow) { - if (avatar->isSelf() && !gAgent.needsRenderAvatar()) + if (avatar->isSelf() && !gAgent.needsRenderAvatar() || !gMeshRepo.meshRezEnabled()) { return; } |