summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-18 18:46:41 -0800
committerJames Cook <james@lindenlab.com>2010-02-18 18:46:41 -0800
commitee81adb01b8619302898471fdbba5c93f716d10b (patch)
tree559001412f567f8f8988a89efd88f19bc5030c93 /indra/newview/lltoolpie.cpp
parent9cb30255b6b8827410a32c6bee1c22b8011de60e (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/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 9480ca0fdf..1ddf6db0e2 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -873,7 +873,8 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
LLAvatarName av_name;
- if (LLAvatarNameCache::get(hover_object->getID(), &av_name))
+ if (LLAvatarNameCache::useDisplayNames()
+ && LLAvatarNameCache::get(hover_object->getID(), &av_name))
{
final_name = av_name.mDisplayName + " (" + av_name.mSLID + ")";
}