diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-16 10:34:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-16 10:34:40 -0400 |
| commit | f87d4b82830b2c4d475d4f458b023ba1a57966e8 (patch) | |
| tree | 9ddd47ec8784e259730aae2327b147c65937983a | |
| parent | 119e1e503baf75139835ed852cd538bd5d95d21a (diff) | |
| parent | 2ee30986cdf79813add265cfc678f96461b52107 (diff) | |
merge changes for MAINT-5022
| -rwxr-xr-x | indra/newview/lldrawpoolavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 42a23faa49..6d98c2feda 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1265,7 +1265,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) if (impostor) { - if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && avatarp->mImpostor.isComplete()) + if (LLPipeline::sRenderDeferred && !LLPipeline::sReflectionRender && avatarp->mImpostor.isComplete() && !avatarp->isTooComplex()) { if (normal_channel > -1) { |