summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarnamecache.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-10 15:30:38 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-10 15:30:38 -0700
commit8b5ce1e474ac621fc0d8da029e710734792e319d (patch)
treed5ad22286bd84418d9ba6356017003d891165243 /indra/llmessage/llavatarnamecache.cpp
parentc64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Pull merge from lindenlab/viewer-release
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);