summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-07-09 14:32:46 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-07-09 14:32:46 -0400
commitff3827f278d2d53f565bc585edc4db5bc5e5dc38 (patch)
tree87ba73e79aeb4af20816755f4226acdb942280c6 /indra/newview/llstartup.cpp
parentbfb9fc85b9c8b59d5cddced665d8be2e6907b455 (diff)
parent3e6698073cedc8b24068147cf6b7091f081ea125 (diff)
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-xindra/newview/llstartup.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 56fac3b092..0c282a19a5 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2833,6 +2833,7 @@ void LLStartUp::initNameCache()
// capabilities for display name lookup
LLAvatarNameCache::initClass(false,gSavedSettings.getBOOL("UsePeopleAPI"));
LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));
+ LLAvatarNameCache::setUseUsernames(gSavedSettings.getBOOL("NameTagShowUsernames"));
}
void LLStartUp::cleanupNameCache()