diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-08 15:59:11 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-08 15:59:11 -0500 |
| commit | ca5a87b819d8f33fd32a58e0c6c9cf2ca216ae7d (patch) | |
| tree | 8ef49d890c07a2b5f95b76b39d72ddc111d6eea3 /indra/newview/lldrawpoolavatar.cpp | |
| parent | d3aa36f1d478d51790e0fdf604e590baa04a93a4 (diff) | |
| parent | d9dfa9b8707b3bf68d7c5cd03a6ca738be7f891f (diff) | |
merge
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; } |