diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-04-03 18:56:46 -0400 |
| commit | d7481cd07c3e0b5eed54ff6a3539406d09ed0669 (patch) | |
| tree | 7e0d2a2a9733784f16518b977423deb225021651 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 076761a03d7cb8b53e6e3d4f2120091eabeba37a (diff) | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
Merge. Refresh from viewer-release after 3.7.4 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); |