diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-11 17:41:41 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-11 17:41:41 +0200 |
| commit | aa42870d5ad1edc9ea33c62c5bf66e84375c3b0e (patch) | |
| tree | 5bbd74f0b89fed271fc9ca8eb01ddd5954a26f94 /indra/newview/llnamelistctrl.cpp | |
| parent | dca797c3db34d119ccdc2d6f24c7742df75ff9c6 (diff) | |
| parent | a53caef1e8314f9cf2af3c0081bf57d5f20db560 (diff) | |
Merged lindenlab/viewer-lion into default
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rwxr-xr-x | indra/newview/llnamelistctrl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 5510598ae7..fe75ab8e50 100755 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -345,7 +345,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow( } mAvatarNameCacheConnections.erase(it); } - 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, suffix, prefix, item->getHandle())); if(mPendingLookupsRemaining <= 0) { @@ -418,6 +418,7 @@ void LLNameListCtrl::removeNameItem(const LLUUID& agent_id) void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name, std::string suffix, + std::string prefix, LLHandle<LLNameListItem> item) { avatar_name_cache_connection_map_t::iterator it = mAvatarNameCacheConnections.find(agent_id); @@ -442,6 +443,11 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id, name.append(suffix); } + if (!prefix.empty()) + { + name.insert(0, prefix); + } + LLNameListItem* list_item = item.get(); if (list_item && list_item->getUUID() == agent_id) { |