diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index 355ef65cfc..4d19b791e9 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -160,7 +160,7 @@ BOOL FSFloaterContacts::postBuild() mRlvBehaviorCallbackConnection = gRlvHandler.setBehaviourCallback(boost::bind(&FSFloaterContacts::updateRlvRestrictions, this, _1)); - gSavedSettings.getControl("FSFriendListFullNameFormat")->getSignal()->connect(boost::bind(&FSFloaterContacts::onFullNameFormatChanged, this)); + gSavedSettings.getControl("FSFriendListFullNameFormat")->getSignal()->connect(boost::bind(&FSFloaterContacts::onDisplayNameChanged, this)); gSavedSettings.getControl("FSFriendListSortOrder")->getSignal()->connect(boost::bind(&FSFloaterContacts::sortFriendList, this)); gSavedSettings.getControl("FSFriendListColumnShowUserName")->getSignal()->connect(boost::bind(&FSFloaterContacts::onColumnDisplayModeChanged, this, "FSFriendListColumnShowUserName")); gSavedSettings.getControl("FSFriendListColumnShowDisplayName")->getSignal()->connect(boost::bind(&FSFloaterContacts::onColumnDisplayModeChanged, this, "FSFriendListColumnShowDisplayName")); @@ -1159,19 +1159,6 @@ void FSFloaterContacts::onColumnDisplayModeChanged(const std::string& settings_n mFriendsList->setSearchColumn(mFriendsList->getColumn("full_name")->mIndex); } -void FSFloaterContacts::onFullNameFormatChanged() -{ - std::vector items = mFriendsList->getAllData(); - for (std::vector::iterator it = items.begin(); it != items.end(); ++it) - { - LLAvatarName av_name; - if (LLAvatarNameCache::get((*it)->getUUID(), &av_name)) - { - (*it)->getColumn(LIST_FRIEND_NAME)->setValue(getFullName(av_name)); - } - } -} - void FSFloaterContacts::onDisplayNameChanged() { std::vector items = mFriendsList->getAllData(); diff --git a/indra/newview/fsfloatercontacts.h b/indra/newview/fsfloatercontacts.h index 7ea7a93659..d49fe297e8 100644 --- a/indra/newview/fsfloatercontacts.h +++ b/indra/newview/fsfloatercontacts.h @@ -117,7 +117,6 @@ private: // misc callbacks static void onAvatarPicked(const uuid_vec_t& ids, const std::vector names); void onColumnDisplayModeChanged(const std::string& settings_name = ""); - void onFullNameFormatChanged(); void onDisplayNameChanged(); // friend buttons