diff options
| author | Richard Nelson <none@none> | 2010-07-30 15:17:50 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-30 15:17:50 -0700 |
| commit | c60fd88714727a86d5b905c1986bc2ca6013791e (patch) | |
| tree | c41da40bbfe02dc2d1441b95e5a0e84cf7dd300b /indra/newview/llspeakers.cpp | |
| parent | fbd05e947829714d81278dfa0b138b22e32d56a7 (diff) | |
| parent | b95ad3b5cec84387d20d2a1af08eeb090b54b134 (diff) | |
merge
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 bf00b47c21..5128ab6a18 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -74,7 +74,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) |