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-05-26 09:17:14 -04:00
parent fda331bb80
commit bf8b02b1f3
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -440,6 +440,7 @@ Jonathan Yap
STORM-1095
STORM-1236
STORM-1259
STORM-899
Kage Pixel
VWR-11
Ken March

3
indra/newview/llcofwearables.cpp
View File

@ -296,7 +296,7 @@ LLCOFWearables::~LLCOFWearables()
// virtual
BOOL LLCOFWearables::postBuild()
{
mAttachments = getChild<LLFlatListView>("list_attachments");
mAttachments = getChild<LLFlatListViewEx>("list_attachments");
mClothing = getChild<LLFlatListView>("list_clothing");
mBodyParts = getChild<LLFlatListView>("list_body_parts");
@ -317,6 +317,7 @@ 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));

2
indra/newview/llcofwearables.h
View File

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

3
indra/newview/skins/default/xui/en/panel_cof_wearables.xml
View File

@ -53,9 +53,6 @@
name="list_attachments"
top="0"
width="311">
<flat_list_view.no_items_text
value="No attachments worn" />
</flat_list_view>
</accordion_tab>
<accordion_tab
layout="topleft"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2092,6 +2092,8 @@ Requests name of an avatar. When data is available the dataserver event will be
<string name="InvFolder Friends">Friends</string>
<string name="InvFolder All">All</string>
<string name="no_attachments">No attachments worn</string>
<!-- inventory FVBridge -->
<!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale -->
<string name="Buy">Buy</string>