diff options
author | davep <none@none> | 2014-08-27 13:04:32 -0500 |
---|---|---|
committer | davep <none@none> | 2014-08-27 13:04:32 -0500 |
commit | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch) | |
tree | eea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llstartup.cpp | |
parent | d0428575fb9c3d285dc32e61808a877cb24efa89 (diff) | |
parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) |
Automated merge with https://bitbucket.org/davep/viewer-release
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-x | indra/newview/llstartup.cpp | 1 |
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() |