diff options
| author | James Cook <james@lindenlab.com> | 2010-04-13 12:03:49 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-04-13 12:03:49 -0700 |
| commit | a159751e61526f7d389c2b951be057b5155f1c69 (patch) | |
| tree | c53d7a5e5b23261216af7682cccdac1846f4c7d6 /indra/newview | |
| parent | e390e4f2b5a1e8a938e7d66842bc6c29cfd19436 (diff) | |
Hide SLID if it matches display name, leave SLIDs on by default otherwise
I don't like this, but Crimp and Hamilton want it to address M's concerns
about impersonation.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 74ff9b74b6..881012467e 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2871,10 +2871,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) addNameTagLine(av_name.mDisplayName, name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif()); } - if (show_slids) + // Suppress SLID display if display name matches exactly (ugh) + if (show_slids && !av_name.mIsDisplayNameDefault) { // JAMESDEBUG HACK - LLColor4 slid_color = name_tag_color * 0.8f; + LLColor4 slid_color = name_tag_color * 0.83f; addNameTagLine(av_name.mSLID, slid_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall()); } |