diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
| commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
| tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/llspeakers.cpp | |
| parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 196ed5e0bb..40aea05839 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -70,13 +70,13 @@ void LLSpeaker::lookupName() { if (mDisplayName.empty()) { - gCacheName->get(mID, FALSE, boost::bind(&LLSpeaker::onAvatarNameLookup, this, _1, _2, _3, _4)); + gCacheName->get(mID, false, boost::bind(&LLSpeaker::onNameCache, this, _1, _2, _3)); } } -void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group) +void LLSpeaker::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group) { - mDisplayName = first + " " + last; + mDisplayName = full_name; } bool LLSpeaker::isInVoiceChannel() |