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 | |
| parent | fd2d23aa2c1f726dc522bbc268a92de5ee649f79 (diff) | |
Fix merge problem, crash on close prefs due to SmallAvatarNames
Was deleted in trunk in code I refactored extensively.
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 11 |
2 files changed, 1 insertions, 14 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); diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 15db679f2a..131d9312af 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -248,17 +248,6 @@ </radio_group> <check_box enabled_control="AvatarNameTagMode" - control_name="SmallAvatarNames" - height="16" - initial_value="true" - label="Small name tags" - layout="topleft" - left="70" - name="small_avatar_names_checkbox" - top_pad="4" - width="200" /> - <check_box - enabled_control="AvatarNameTagMode" control_name="RenderNameShowSelf" height="16" label="Show my name" |