From 944ffe50ee54cf73c4dfc5550e6e17b995c39069 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 16 May 2014 12:08:00 +0200
Subject: [PATCH] Refactor legacy friendlist and move out font name into the
 XML for per-skin customization

---
 indra/newview/fsfloatercontacts.cpp                            | 3 ++-
 indra/newview/fsfloatercontacts.h                              | 2 ++
 .../skins/ansastorm/xui/en/panel_fs_contacts_friends.xml       | 1 +
 .../newview/skins/default/xui/en/panel_fs_contacts_friends.xml | 1 +
 .../skins/firestorm/xui/en/panel_fs_contacts_friends.xml       | 1 +
 .../newview/skins/latency/xui/en/panel_fs_contacts_friends.xml | 1 +
 .../newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml | 1 +
 7 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp
index 9a4750b0a7..dfdcd92457 100644
--- a/indra/newview/fsfloatercontacts.cpp
+++ b/indra/newview/fsfloatercontacts.cpp
@@ -113,6 +113,7 @@ BOOL FSFloaterContacts::postBuild()
 {
 	mTabContainer = getChild<LLTabContainer>("friends_and_groups");
 	mFriendsTab = getChild<LLPanel>(FRIENDS_TAB_NAME);
+	mFriendListFontName = mFriendsTab->getString("FontName");
 
 	mFriendsList = mFriendsTab->getChild<LLScrollListCtrl>("friend_list");
 	mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
@@ -584,7 +585,7 @@ void FSFloaterContacts::addFriend(const LLUUID& agent_id)
 	LLSD& friend_column					= element["columns"][LIST_FRIEND_NAME];
 	friend_column["column"]				= "full_name";
 	friend_column["value"]				= av_name.getCompleteName();
-	friend_column["font"]["name"]		= "SANSSERIF";
+	friend_column["font"]["name"]		= mFriendListFontName;
 	friend_column["font"]["style"]		= "NORMAL";
 
 	LLSD& online_status_column			= element["columns"][LIST_ONLINE_STATUS];
diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h
index 30c683e70e..9639f1514e 100644
--- a/indra/newview/fsfloatercontacts.h
+++ b/indra/newview/fsfloatercontacts.h
@@ -140,6 +140,8 @@ private:
 	BOOL					mAllowRightsChange;
 	S32						mNumRightsChanged;
 	LLCachedControl<bool>	mSortByUserName;
+
+	std::string				mFriendListFontName;
 };
 
 
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
index 378302bd7b..d3b8b43251 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
@@ -5,6 +5,7 @@
  mouse_opaque="true"
  name="friends"
  width="355">
+	<panel.string name="FontName" value="SANSSERIF"/>
 	<panel.string name="FriendCount" value="Friends: [COUNT]"/>
 <!--
 	<view_border
diff --git a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
index 3e9a0d2760..4dd8c9295e 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
@@ -5,6 +5,7 @@
  mouse_opaque="true"
  name="friends"
  width="355">
+	<panel.string name="FontName" value="SANSSERIF"/>
 	<panel.string name="FriendCount" value="Friends: [COUNT]"/>
 <!--
 	<view_border
diff --git a/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
index 378302bd7b..d3b8b43251 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
@@ -5,6 +5,7 @@
  mouse_opaque="true"
  name="friends"
  width="355">
+	<panel.string name="FontName" value="SANSSERIF"/>
 	<panel.string name="FriendCount" value="Friends: [COUNT]"/>
 <!--
 	<view_border
diff --git a/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
index 378302bd7b..d3b8b43251 100644
--- a/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
@@ -5,6 +5,7 @@
  mouse_opaque="true"
  name="friends"
  width="355">
+	<panel.string name="FontName" value="SANSSERIF"/>
 	<panel.string name="FriendCount" value="Friends: [COUNT]"/>
 <!--
 	<view_border
diff --git a/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml b/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
index e2d25cb895..8c9d9db77d 100644
--- a/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
+++ b/indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
@@ -5,6 +5,7 @@
  mouse_opaque="true"
  name="friends"
  width="355">
+	<panel.string name="FontName" value="SANSSERIF"/>
 	<panel.string name="FriendCount" value="Friends: [COUNT]"/>
 	<view_border
 	 top="1"