Fix merge problem, crash on close prefs due to SmallAvatarNames

Was deleted in trunk in code I refactored extensively.

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);

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"