diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
| commit | ba2300b8aeff30a64d3f34b0cd5c49aa890e0639 (patch) | |
| tree | d7a7f4aa61d1b2bd28374e5c61f3d6730d450574 /indra/newview/llpanelpicks.cpp | |
| parent | a8b5da9a70936923e650bd5c200276da49106784 (diff) | |
| parent | 18321756297bd9b04a4204abe4fbb0e3e8112186 (diff) | |
pull fix for STORM-211
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 27787ac211..ccef563544 100644 --- a/indra/newview/llpanelpicks.cpp +++ b/indra/newview/llpanelpicks.cpp @@ -229,9 +229,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); - getChild<LLUICtrl>("pick_title")->setTextArg("[NAME]", name); + std::string full_name; + gCacheName->getFullName(getAvatarId(), full_name); + getChild<LLUICtrl>("pick_title")->setTextArg("[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]; |