diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
| commit | b6708435214a5af158956b0f6ef6a90bacbcc142 (patch) | |
| tree | 1a0f0612cc87d43e33d466afc7d6928ec7a2e20b /indra/llmessage/llavatarnamecache.cpp | |
| parent | 20d486b52fb8ecefc03eb63a93e4447513d704d2 (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -rwxr-xr-x | indra/llmessage/llavatarnamecache.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 9a68093427..31dd264021 100755 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -680,6 +680,15 @@ void LLAvatarNameCache::setUseDisplayNames(bool use) } } +void LLAvatarNameCache::setUseUsernames(bool use) +{ + if (use != LLAvatarName::useUsernames()) + { + LLAvatarName::setUseUsernames(use); + mUseDisplayNamesSignal(); + } +} + void LLAvatarNameCache::erase(const LLUUID& agent_id) { sCache.erase(agent_id); |