diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:13:08 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-06 19:13:08 -0500 |
| commit | 5cfc4764db10b91b5f34dc29d1505faaf597c7b7 (patch) | |
| tree | 9bdf3a47475f34d7459ad5108e72cc087e9b5f58 /indra/newview/lldrawpoolavatar.cpp | |
| parent | c4b7728f0ef19efcaef02ccabf7d98f5b340cfd3 (diff) | |
| parent | b3fbb12f155ae1acc6b4d258d1c383d5d8e47964 (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; } |