diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
| commit | 56d9d204f76978bf1373e15c84649a87d40dd16d (patch) | |
| tree | c55324326ee8c8b05419d27b49f0b89aa63cd85a /indra/newview/pipeline.cpp | |
| parent | 9475a593a170f0c90a8d353de3e1277f844ee913 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7cb6d37cff..e651280265 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8747,7 +8747,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; } |