livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales

master
Jonathan Yap 2011-06-07 16:43:38 -04:00
parent bf8b02b1f3
commit 9134ec0197
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llcofwearables.cpp
View File

@ -296,7 +296,7 @@ LLCOFWearables::~LLCOFWearables()
// virtual
BOOL LLCOFWearables::postBuild()
{
mAttachments = getChild<LLFlatListViewEx>("list_attachments");
mAttachments = getChild<LLFlatListView>("list_attachments");
mClothing = getChild<LLFlatListView>("list_clothing");
mBodyParts = getChild<LLFlatListView>("list_body_parts");
@ -317,8 +317,6 @@ BOOL LLCOFWearables::postBuild()
mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
mAttachments->setNoItemsMsg(getString("no_attachments"));
mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
@ -500,6 +498,10 @@ void LLCOFWearables::populateAttachmentsAndBodypartsLists(const LLInventoryModel
mAttachments->sort();
mAttachments->notify(REARRANGE); //notifying the parent about the list's size change (cause items were added with rearrange=false)
}
else
{
mAttachments->setNoItemsCommentText(LLTrans::getString("no_attachments"));
}
if (mBodyParts->size())
{

2
indra/newview/llcofwearables.h
View File

@ -106,7 +106,7 @@ protected:
void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu);
LLFlatListViewEx* mAttachments;
LLFlatListView* mAttachments;
LLFlatListView* mClothing;
LLFlatListView* mBodyParts;