summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-03-19 11:41:42 -0700
committersimon <none@none>2014-03-19 11:41:42 -0700
commit00a325ccb90b1c6800ec78e1211b5097d9c27a58 (patch)
tree8b58fbd99d5bce117cf8dad5181b5690af4bd34f /indra/newview/llstartup.cpp
parent09d1c27d4f78c78d949b6a3d896d6f58df2dfc06 (diff)
parent1ab9f19f82a84a109cf429998f423986268801f6 (diff)
Pull in viewer-lion to lock down next 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 d5f8a1e46e..a5fdb72f9b 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2822,6 +2822,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()