diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
| commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
| tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llspeakers.cpp | |
| parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
| parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) | |
Sync with viewer-development
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 1c418feabd..196ed5e0bb 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -68,7 +68,10 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy void LLSpeaker::lookupName() { - gCacheName->get(mID, FALSE, boost::bind(&LLSpeaker::onAvatarNameLookup, this, _1, _2, _3, _4)); + if (mDisplayName.empty()) + { + gCacheName->get(mID, FALSE, boost::bind(&LLSpeaker::onAvatarNameLookup, this, _1, _2, _3, _4)); + } } void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group) |