diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-05-01 09:04:14 -0700 |
| commit | bb0e2e6b957f9abf3ddc819d20aea3936d500467 (patch) | |
| tree | bc6ed362332740ea6e5829966d1afd618f1b60fb /indra/newview/llpanelpicks.cpp | |
| parent | dca8d3b5f569ed0b074a58cd054ea3065a15a717 (diff) | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index 55c09d85ea..77bc99da83 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -384,9 +384,9 @@ void LLPanelPicks::processProperties(void* data, EAvatarProcessorType type) LLAvatarPicks* avatar_picks = static_cast<LLAvatarPicks*>(data); if(avatar_picks && getAvatarId() == avatar_picks->target_id) { - std::string full_name; - gCacheName->getFullName(getAvatarId(), full_name); - getChild<LLUICtrl>("pick_title")->setTextArg("[NAME]", full_name); + LLAvatarName av_name; + LLAvatarNameCache::get(getAvatarId(), &av_name); + getChild<LLUICtrl>("pick_title")->setTextArg("[NAME]", av_name.getUserName()); // Save selection, to be able to edit same item after saving changes. See EXT-3023. LLUUID selected_id = mPicksList->getSelectedValue()[PICK_ID]; |