From a159751e61526f7d389c2b951be057b5155f1c69 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 13 Apr 2010 12:03:49 -0700 Subject: 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. --- indra/newview/llvoavatar.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra') 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()); } -- cgit v1.2.3