summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-15 20:43:17 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-15 20:43:17 +0300
commitdae67e9f960bf02e3fecb59c7a11a90410054235 (patch)
tree11b2f01d56164d444184b8101618e876f18b9c62 /indra/newview/llvoavatar.cpp
parentbe7d81626e512019b46a8ed301b4a1825e129aa5 (diff)
parent33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 5584efeb7b..b5db5d4a48 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -10467,6 +10467,11 @@ void LLVOAvatar::calcMutedAVColor()
new_color = LLColor4::grey4;
change_msg = " blocked: color is grey4";
}
+ else if (!isTooComplex())
+ {
+ new_color = LLColor4::white;
+ change_msg = " simple imposter ";
+ }
else if ( mMutedAVColor == LLColor4::white || mMutedAVColor == LLColor4::grey3 || mMutedAVColor == LLColor4::grey4 )
{
// select a color based on the first byte of the agents uuid so any muted agent is always the same color