diff options
| author | simon <none@none> | 2013-11-25 09:17:29 -0800 |
|---|---|---|
| committer | simon <none@none> | 2013-11-25 09:17:29 -0800 |
| commit | 5756b7b3d05ce330e9877650ba6af04aaa4da49d (patch) | |
| tree | a1668748b931f0b0a9bd2df80aa24b1c156e8f9e /indra/llmessage/llavatarnamecache.cpp | |
| parent | f1be57cd30489902e44d7843703a39987f379c69 (diff) | |
| parent | 1ae4d45337b380213112183f153a631d4c3f3289 (diff) | |
Merge - doh!
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); |