summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarlistitem.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-01 17:06:18 -0800
committerJames Cook <james@lindenlab.com>2010-02-01 17:06:18 -0800
commit146e9d5e4d9a9a4f33d9ccd47a901980972b7ab9 (patch)
tree534d2389e2d701819597cd0b56130a2551b41bfb /indra/newview/llavatarlistitem.cpp
parent130214c766763855b733c9b5d4e177afe0c39865 (diff)
Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism Change Pay dialog names to SLURL links Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit Consolidate name first + " " + last concatenation in LLCacheName::buildFullName() Reviewed with Kelly
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
-rw-r--r--indra/newview/llavatarlistitem.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 66ab32f3e8..6024dd8a21 100644
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -193,7 +193,7 @@ void LLAvatarListItem::setAvatarId(const LLUUID& id, bool ignore_status_changes)
LLAvatarTracker::instance().addParticularFriendObserver(mAvatarId, this);
// Set avatar name.
- gCacheName->get(id, FALSE, boost::bind(&LLAvatarListItem::onNameCache, this, _2, _3));
+ gCacheName->get(id, false, boost::bind(&LLAvatarListItem::onNameCache, this, _2));
}
void LLAvatarListItem::showLastInteractionTime(bool show)
@@ -298,10 +298,9 @@ void LLAvatarListItem::setNameInternal(const std::string& name, const std::strin
mAvatarName->setToolTip(name);
}
-void LLAvatarListItem::onNameCache(const std::string& first_name, const std::string& last_name)
+void LLAvatarListItem::onNameCache(const std::string& fullname)
{
- std::string name = first_name + " " + last_name;
- setName(name);
+ setName(fullname);
}
// Convert given number of seconds to a string like "23 minutes", "15 hours" or "3 years",