summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-07-02 16:57:00 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-07-02 16:57:00 +0100
commitd1a1036e15ce82fa9b5701d5ea02c037bcbe5e70 (patch)
tree87df964f9901fd9afed2406973c89eafccc71789 /indra/newview
parent4deac75d1ee7f96a39ff1307132c005ff2e0ad68 (diff)
SL-13541 - conceal animesh attachments of invisible (blocked) avs
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoavatar.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index e0f87aead9..c0618b55ad 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10741,7 +10741,11 @@ LLVOAvatar::AvatarOverallAppearance LLVOAvatar::getOverallAppearance() const
}
else // !isSelf()
{
- if (mVisuallyMuteSetting == AV_ALWAYS_RENDER)
+ if (isInMuteList())
+ {
+ result = AOA_INVISIBLE;
+ }
+ else if (mVisuallyMuteSetting == AV_ALWAYS_RENDER)
{
result = AOA_NORMAL;
}
@@ -10749,10 +10753,6 @@ LLVOAvatar::AvatarOverallAppearance LLVOAvatar::getOverallAppearance() const
{ // Always want to see this AV as an impostor
result = AOA_JELLYDOLL;
}
- else if (isInMuteList())
- {
- result = AOA_INVISIBLE;
- }
else if (isTooComplex())
{
result = AOA_JELLYDOLL;