diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-19 14:23:14 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-19 14:23:14 -0700 |
| commit | c39d74ac985e789eef8ee988cf8ba80fb2402683 (patch) | |
| tree | 6d62904c00c84390f84036cb3b0984fe416a6b2c /indra/newview/lltoolpie.cpp | |
| parent | 650171af1788435e200c62965c3ffe314d2082db (diff) | |
synchronous llavatarcachename::get calls now return true even if entry is expired
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 809d39885d..479993c4dd 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -879,18 +879,15 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l full_name = LLTrans::getString("TooltipPerson"); } } - if (LLAvatarNameCache::useDisplayNames()) - { - LLAvatarName av_name; - LLAvatarNameCache::get(hover_object->getID(), &av_name); - if (!av_name.mDisplayName.empty()) - { - final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")"; - } - else - { - final_name = full_name; - } + + LLAvatarName av_name;
+ if (LLAvatarNameCache::get(hover_object->getID(), &av_name))
+ {
+ final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
+ }
+ else
+ {
+ final_name = full_name;
} // *HACK: We may select this object, so pretend it was clicked |