summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2016-03-02 18:35:43 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2016-03-02 18:35:43 +0200
commit0ffc4f2667806653d1f0548fdda7eb91bdea5025 (patch)
tree14002056547d65454d1088c1a947772a6e6dfa06 /indra/newview/pipeline.cpp
parentca7631e4d71c693a5a502c05a482ab01ada7888a (diff)
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp4
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;
}