diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:35:39 -0400 |
| commit | 068e3cc469793c75b0d54ef0864388582bb3b63c (patch) | |
| tree | dbab152cf43bc84f23b2f63f9e8f8d83117e28af /indra/newview/llspeakers.cpp | |
| parent | e748167abfabbc541c3ceb9e2d5a46fa3564f15a (diff) | |
| parent | 8158c5637a9ad83a7b36b104116c37390b57c7ab (diff) | |
pull fix for STORM-304 / STORM-386
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() |