diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
| commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
| tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llspeakers.cpp | |
| parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index e7971028bf..19d1af34f9 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -29,6 +29,7 @@ #include "llspeakers.h" #include "llagent.h" +#include "llavatarnamecache.h" #include "llappviewer.h" #include "llimview.h" #include "llgroupmgr.h" @@ -75,13 +76,13 @@ void LLSpeaker::lookupName() { if (mDisplayName.empty()) { - gCacheName->get(mID, false, boost::bind(&LLSpeaker::onNameCache, this, _1, _2, _3)); + LLAvatarNameCache::get(mID, boost::bind(&LLSpeaker::onNameCache, this, _1, _2)); // todo: can be group??? } } -void LLSpeaker::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group) +void LLSpeaker::onNameCache(const LLUUID& id, const LLAvatarName& av_name) { - mDisplayName = full_name; + mDisplayName = av_name.getUserName(); } bool LLSpeaker::isInVoiceChannel() |