diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-03-27 11:59:35 -0700 |
| commit | dfd78e83d91832b486a5bba6b1bb1cce621163ab (patch) | |
| tree | 5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 22ea5ac41ca3a1f7a884b56526791f611834f76b (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Pulled merge from 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); |