diff options
author | James Cook <james@lindenlab.com> | 2010-02-11 16:39:15 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-02-11 16:39:15 -0800 |
commit | c2373fb5a6b08b2c32e5f93fa67b25f669e8b47f (patch) | |
tree | 1d699db4ebe531cdeeffb7dd16dee4e565d7da26 /indra/newview/lltoolpie.cpp | |
parent | 9dd7924b19651abf393f7b0dee632904a6b8e52a (diff) |
Created stub LLAvatarNameCache for display name lookup, as
well as LLAvatarName base data object.
Reviewed with Kelly.
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 4a61bed475..9480ca0fdf 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -39,6 +39,7 @@ #include "llparcel.h" #include "llagent.h" +#include "llavatarnamecache.h" #include "llviewercontrol.h" #include "llfocusmgr.h" //#include "llfirstuse.h" @@ -871,10 +872,10 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l full_name = LLTrans::getString("TooltipPerson"); } } - std::string display_name; - if (gCacheName->getDisplayName(hover_object->getID(), display_name)) + LLAvatarName av_name; + if (LLAvatarNameCache::get(hover_object->getID(), &av_name)) { - final_name = display_name + " (" + full_name + ")"; + final_name = av_name.mDisplayName + " (" + av_name.mSLID + ")"; } else { |