diff options
| author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
| commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
| tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/newview/llpanelpicks.cpp | |
| parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
| parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) | |
merge
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 bde8d02885..291da5fdd2 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -235,9 +235,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 name, second_name; - gCacheName->getName(getAvatarId(),name,second_name); - childSetTextArg("pick_title", "[NAME]",name); + std::string full_name; + gCacheName->getFullName(getAvatarId(), full_name); + childSetTextArg("pick_title", "[NAME]", full_name); // Save selection, to be able to edit same item after saving changes. See EXT-3023. LLUUID selected_id = mPicksList->getSelectedValue()[PICK_ID]; |