summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarnamecache.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-03-10 13:06:06 -0700
committerdolphin <dolphin@lindenlab.com>2014-03-10 13:06:06 -0700
commit34c12d009c232917732e6eeb452da7e76b2ee12e (patch)
tree847155313ac7588a23f3ee71d3ee8f3ab30580c9 /indra/llmessage/llavatarnamecache.cpp
parent7b9817cbcc5acab58d9d4355984b429850bd3ef8 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
-rwxr-xr-xindra/llmessage/llavatarnamecache.cpp9
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);