From 3bc7e63f92b29f4be44a589b661d7ff911b443cf Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 12 May 2010 13:54:49 -0700
Subject: Fix merge problem, crash on close prefs due to SmallAvatarNames

Was deleted in trunk in code I refactored extensively.
---
 indra/newview/llvoavatar.cpp                                  |  4 +---
 .../skins/default/xui/en/panel_preferences_general.xml        | 11 -----------
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'indra/newview')

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
@@ -246,17 +246,6 @@
          value="2"
          width="160" />
     </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"
-- 
cgit v1.2.3