summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.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/llvoavatar.cpp
parentca7631e4d71c693a5a502c05a482ab01ada7888a (diff)
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c88f5d1fce..c3c18f7c54 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1,4 +1,4 @@
-/**
+/**
* @File llvoavatar.cpp
* @brief Implementation of LLVOAvatar class which is a derivation of LLViewerObject
*
@@ -8138,7 +8138,7 @@ void LLVOAvatar::updateImpostors()
{
LLVOAvatar* avatar = (LLVOAvatar*) *iter;
if (!avatar->isDead() && avatar->isVisible()
- && (avatar->isImpostor() && avatar->needsImpostorUpdate())
+ && ((avatar->isImpostor() || LLVOAvatar::AV_DO_NOT_RENDER == avatar->getVisualMuteSettings()) && avatar->needsImpostorUpdate())
)
{
avatar->calcMutedAVColor();
@@ -8487,7 +8487,7 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
void LLVOAvatar::setVisualMuteSettings(VisualMuteSettings set)
{
mVisuallyMuteSetting = set;
- mNeedsImpostorUpdate = true;
+ mNeedsImpostorUpdate = TRUE;
}