diff options
| author | James Cook <james@lindenlab.com> | 2010-04-07 10:26:03 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-04-07 10:26:03 -0700 |
| commit | 99f5307543e03e296edf2d9d9c0b26d38d56d034 (patch) | |
| tree | 2b195b5fb9cf6d1055ffa500439119e5bcf34db5 /indra/newview/llvoavatar.cpp | |
| parent | abd2b7d1b2c5d601d9468534018cff39228ae975 (diff) | |
SLID goes under display name
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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 { |