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("friends_and_groups"); mFriendsTab = getChild(FRIENDS_TAB_NAME); + mFriendListFontName = mFriendsTab->getString("FontName"); mFriendsList = mFriendsTab->getChild("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 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"> +