livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove now redundant method in FSFloaterContacts

Ansariel 2014-08-08 21:13:46 +02:00
parent d3eccf7975
commit 41a3d7c2e2
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/fsfloatercontacts.cpp
View File

@ -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<LLScrollListItem*> items = mFriendsList->getAllData();
for (std::vector<LLScrollListItem*>::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<LLScrollListItem*> items = mFriendsList->getAllData();

1
indra/newview/fsfloatercontacts.h
View File

@ -117,7 +117,6 @@ private:
// misc callbacks
static void onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
void onColumnDisplayModeChanged(const std::string& settings_name = "");
void onFullNameFormatChanged();
void onDisplayNameChanged();
// friend buttons