summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-12-14 00:46:11 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-12-14 00:46:11 +0200
commit74a56f30aa0ef4daef41ef5fdac98610b2b109df (patch)
treef526ea45ddc0e0724c2c34ecc59b70cd7ea3c2a2 /indra/newview/pipeline.cpp
parent4ab4c4498a04576a3cddf3533359a15a636b53b6 (diff)
parenta3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1cbd8ecaf1..7be5c86679 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -8681,7 +8681,8 @@ void LLPipeline::renderDeferredLighting()
}
const LLViewerObject *vobj = drawablep->getVObj();
- if(vobj && vobj->getAvatar() && vobj->getAvatar()->isInMuteList())
+ if(vobj && vobj->getAvatar()
+ && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList()))
{
continue;
}