diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-04 16:45:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-04 16:45:04 -0500 |
| commit | 346ee6595d395a92a1445441467971510e6f4b6d (patch) | |
| tree | 0827969b1bc9675f4046c87aedf6ec935ed938c8 /indra/newview/pipeline.cpp | |
| parent | ef514c800159218eca634d199890d835bb118353 (diff) | |
| parent | 9c727eb2fb9924f0b67fb1e4d0e1cdaf2f20e969 (diff) | |
merge latest changes from ruslan
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; } |