diff options
| author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
|---|---|---|
| committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
| commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
| tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/newview/llpanelpicks.cpp | |
| parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/newview/llpanelpicks.cpp')
| -rw-r--r-- | indra/newview/llpanelpicks.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp index a5c3c9faef..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]; @@ -1039,7 +1039,7 @@ LLPickItem::LLPickItem() , mSnapshotID(LLUUID::null) , mNeedData(true) { - LLUICtrlFactory::getInstance()->buildPanel(this,"panel_pick_list_item.xml"); + buildFromFile("panel_pick_list_item.xml"); } LLPickItem::~LLPickItem() @@ -1169,7 +1169,7 @@ LLClassifiedItem::LLClassifiedItem(const LLUUID& avatar_id, const LLUUID& classi , mAvatarId(avatar_id) , mClassifiedId(classified_id) { - LLUICtrlFactory::getInstance()->buildPanel(this,"panel_classifieds_list_item.xml"); + buildFromFile("panel_classifieds_list_item.xml"); LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this); LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId()); |