Skip to content
Snippets Groups Projects
Commit bf8b02b1 authored by Jonathan Yap's avatar Jonathan Yap
Browse files

STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains...

STORM-899 'No attachments worn' text on blank 'Attachments' accordion remains in English for all locales
parent fda331bb
Branches
Tags
No related merge requests found
...@@ -440,6 +440,7 @@ Jonathan Yap ...@@ -440,6 +440,7 @@ Jonathan Yap
STORM-1095 STORM-1095
STORM-1236 STORM-1236
STORM-1259 STORM-1259
STORM-899
Kage Pixel Kage Pixel
VWR-11 VWR-11
Ken March Ken March
......
...@@ -296,7 +296,7 @@ LLCOFWearables::~LLCOFWearables() ...@@ -296,7 +296,7 @@ LLCOFWearables::~LLCOFWearables()
// virtual // virtual
BOOL LLCOFWearables::postBuild() BOOL LLCOFWearables::postBuild()
{ {
mAttachments = getChild<LLFlatListView>("list_attachments"); mAttachments = getChild<LLFlatListViewEx>("list_attachments");
mClothing = getChild<LLFlatListView>("list_clothing"); mClothing = getChild<LLFlatListView>("list_clothing");
mBodyParts = getChild<LLFlatListView>("list_body_parts"); mBodyParts = getChild<LLFlatListView>("list_body_parts");
...@@ -317,6 +317,7 @@ BOOL LLCOFWearables::postBuild() ...@@ -317,6 +317,7 @@ BOOL LLCOFWearables::postBuild()
mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR); mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR); mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
mAttachments->setNoItemsMsg(getString("no_attachments"));
mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing"); mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2)); mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
......
...@@ -106,7 +106,7 @@ class LLCOFWearables : public LLPanel ...@@ -106,7 +106,7 @@ class LLCOFWearables : public LLPanel
void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu); void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu);
LLFlatListView* mAttachments; LLFlatListViewEx* mAttachments;
LLFlatListView* mClothing; LLFlatListView* mClothing;
LLFlatListView* mBodyParts; LLFlatListView* mBodyParts;
......
...@@ -53,9 +53,6 @@ ...@@ -53,9 +53,6 @@
name="list_attachments" name="list_attachments"
top="0" top="0"
width="311"> width="311">
<flat_list_view.no_items_text
value="No attachments worn" />
</flat_list_view>
</accordion_tab> </accordion_tab>
<accordion_tab <accordion_tab
layout="topleft" layout="topleft"
......
...@@ -2092,6 +2092,8 @@ Requests name of an avatar. When data is available the dataserver event will be ...@@ -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 Friends">Friends</string>
<string name="InvFolder All">All</string> <string name="InvFolder All">All</string>
<string name="no_attachments">No attachments worn</string>
<!-- inventory FVBridge --> <!-- inventory FVBridge -->
<!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale --> <!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale -->
<string name="Buy">Buy</string> <string name="Buy">Buy</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment