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

Backed out changeset 010aa51cbba7 - will be replaced by LL version to prevent merge collisions in the future

master
Ansariel 2015-12-07 19:50:46 +01:00
parent f11c97a357
commit 86e91147d1
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llnamelistctrl.cpp
View File

@ -355,9 +355,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
}
mAvatarNameCacheConnections.erase(it);
}
// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
//mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, prefix, suffix, item->getHandle()));
mAvatarNameCacheConnections[id] = LLAvatarNameCache::get(id,boost::bind(&LLNameListCtrl::onAvatarNameCache,this, _1, _2, suffix, item->getHandle()));
// <FS:Ansariel> Fix Baker's NameListCtrl un-fix
//if(mPendingLookupsRemaining <= 0)
@ -432,7 +430,6 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id)
void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
const LLAvatarName& av_name,
std::string prefix, // <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
std::string suffix,
LLHandle<LLNameListItem> item)
{
@ -458,13 +455,6 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
name.append(suffix);
}
// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
if (!prefix.empty())
{
name = prefix + name;
}
// </FS:Ansariel>
LLNameListItem* list_item = item.get();
if (list_item && list_item->getUUID() == agent_id)
{

5
indra/newview/llnamelistctrl.h
View File

@ -182,10 +182,7 @@ public:
/*virtual*/ void mouseOverHighlightNthItem( S32 index );
private:
void showInspector(const LLUUID& avatar_id, bool is_group, bool is_experience = false);
// <FS:Ansariel> FIRE-17408: Prefix is not passed to name cache callback
//void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, LLHandle<LLNameListItem> item);
void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string prefix, std::string suffix, LLHandle<LLNameListItem> item);
// </FS:Ansariel>
void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, LLHandle<LLNameListItem> item);
private:
S32 mNameColumnIndex;