diff options
| author | James Cook <james@lindenlab.com> | 2010-05-12 13:54:49 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-12 13:54:49 -0700 |
| commit | 3bc7e63f92b29f4be44a589b661d7ff911b443cf (patch) | |
| tree | ea6876243bd22c99dbf7bb10445f4e2bdda1ede5 /indra/newview/llvoavatar.cpp | |
| parent | fd2d23aa2c1f726dc522bbc268a92de5ee649f79 (diff) | |
Fix merge problem, crash on close prefs due to SmallAvatarNames
Was deleted in trunk in code I refactored extensively.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8fa845e54a..9ee2c913c6 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2886,9 +2886,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) } else { - static LLUICachedControl<bool> small_avatar_names("SmallAvatarNames"); - const LLFontGL* font = - (small_avatar_names ? LLFontGL::getFontSansSerif() : LLFontGL::getFontSansSerifBig() ); + const LLFontGL* font = LLFontGL::getFontSansSerif(); std::string full_name = LLCacheName::buildFullName( firstname->getString(), lastname->getString() ); addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font); |