diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-02 13:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-02 13:46:19 -0500 |
| commit | 9c727eb2fb9924f0b67fb1e4d0e1cdaf2f20e969 (patch) | |
| tree | 4118e295bdf310489ae322405cbbc63f57a78161 /indra/newview/pipeline.cpp | |
| parent | 2ed1fd432ae40df91343f8c21dc6ed80abca9f0e (diff) | |
| parent | 0ffc4f2667806653d1f0548fdda7eb91bdea5025 (diff) | |
Merged in ruslantproductengine/ruslanteliuk-391-blizzard (pull request #21)
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4d1725e927..a4d41164e5 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3114,7 +3114,9 @@ void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera) if (vobj) // this test may not be needed, see above { LLVOAvatar* av = vobj->asAvatar(); - if (av && av->isImpostor()) + if (av && (av->isImpostor() + || av->isInMuteList() + || (LLVOAvatar::AV_DO_NOT_RENDER == av->getVisualMuteSettings() && !av->needsImpostorUpdate()) )) { return; } |