diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
| commit | f1784209d5fc4e3f9402fbc8fa66de5a67a73f70 (patch) | |
| tree | 56922332d7fce623e1ad973e09f72d9dd982b289 /indra/newview/lldrawpoolavatar.cpp | |
| parent | 690f18c948003c9d14524da8cdf5b82da8227758 (diff) | |
| parent | 81af06c95490a54e69b6bbf01ae2ef98adb66a02 (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; } |