diff options
| author | James Cook <james@lindenlab.com> | 2010-02-18 18:46:41 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-18 18:46:41 -0800 |
| commit | ee81adb01b8619302898471fdbba5c93f716d10b (patch) | |
| tree | 559001412f567f8f8988a89efd88f19bc5030c93 /indra/llui/llurlentry.cpp | |
| parent | 9cb30255b6b8827410a32c6bee1c22b8011de60e (diff) | |
Preference to set what fields name tags display, and
first attempt at "use display names" menu item which
doesn't work yet
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index ef48f6cd4f..74b9468c26 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -326,7 +326,8 @@ void LLUrlEntryAgent::onNameCache(const LLUUID& id, { // IDEVO demo code LLAvatarName av_name; - if (LLAvatarNameCache::get(id, &av_name)) + if (LLAvatarNameCache::useDisplayNames() + && LLAvatarNameCache::get(id, &av_name)) { std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")"; // use custom icon if available @@ -364,7 +365,8 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa else if (gCacheName->getFullName(agent_id, full_name)) { LLAvatarName av_name; - if (LLAvatarNameCache::get(agent_id, &av_name)) + if (LLAvatarNameCache::useDisplayNames() + && LLAvatarNameCache::get(agent_id, &av_name)) return av_name.mDisplayName + " (" + av_name.mSLID + ")"; else return full_name; |