summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-07-22 18:23:48 -0700
committerAura Linden <aura@lindenlab.com>2014-07-22 18:23:48 -0700
commitf61671aec7a15160f906650b4c7449be68c7b074 (patch)
tree1c8f08f04d137f41c5b8cbf9a579161ff0dd3538 /indra/newview/llstartup.cpp
parent3d4acb535d75c4cc78c93dee318bcffaca691237 (diff)
parent532433674c9553636af9ea8d433b9da6d6fae587 (diff)
Merged in release.
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()