From 99f5307543e03e296edf2d9d9c0b26d38d56d034 Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 7 Apr 2010 10:26:03 -0700 Subject: SLID goes under display name --- indra/newview/llvoavatar.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llvoavatar.cpp') diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5bf9f69ae3..6aac53dd73 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2866,6 +2866,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) } // Might be blank if name not available yet, that's OK + if (show_display_names) + { + addNameTagLine(av_name.mDisplayName, name_tag_color, LLFontGL::NORMAL, + LLFontGL::getFontSansSerif()); + } if (show_slids) { // JAMESDEBUG HACK @@ -2873,11 +2878,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) addNameTagLine(av_name.mSLID, slid_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall()); } - if (show_display_names) - { - addNameTagLine(av_name.mDisplayName, name_tag_color, LLFontGL::NORMAL, - LLFontGL::getFontSansSerif()); - } } else { -- cgit v1.2.3