From 75dbd9bb64aa132c9db60e66687899d015f718ac Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Tue, 1 Nov 2011 03:01:26 -0500 Subject: [PATCH] Sort contacts list at startup by username if "Sort by username" preference is set. Fixes FIRE-3121. --- indra/newview/fscontactsfloater.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/fscontactsfloater.cpp b/indra/newview/fscontactsfloater.cpp index 1e8338edd1..22cebcf977 100644 --- a/indra/newview/fscontactsfloater.cpp +++ b/indra/newview/fscontactsfloater.cpp @@ -126,10 +126,15 @@ BOOL FSFloaterContacts::postBuild() // primary sort = online status, secondary sort = name if (mSortByUserName) + { mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_USER_NAME)->mName; + mFriendsList->sortByColumn(std::string("user_name"), TRUE); + } else + { mFriendsList->getColumn(LIST_FRIEND_NAME)->mSortingColumn = mFriendsList->getColumn(LIST_FRIEND_NAME)->mName; - mFriendsList->sortByColumn(std::string("full_name"), TRUE); + mFriendsList->sortByColumn(std::string("full_name"), TRUE); + } mFriendsList->sortByColumn(std::string("icon_online_status"), FALSE); mFriendsTab->childSetAction("im_btn", boost::bind(&FSFloaterContacts::onImButtonClicked, this));