From bf8b02b1f31ac1b3959a537568b712fdf16d02e2 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 26 May 2011 09:17:14 -0400
Subject: [PATCH] STORM-899 'No attachments worn' text on blank 'Attachments'
accordion remains in English for all locales
---
doc/contributions.txt | 1 +
indra/newview/llcofwearables.cpp | 3 ++-
indra/newview/llcofwearables.h | 2 +-
indra/newview/skins/default/xui/en/panel_cof_wearables.xml | 3 ---
indra/newview/skins/default/xui/en/strings.xml | 2 ++
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c9..c837fdd4687 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -440,6 +440,7 @@ Jonathan Yap
STORM-1095
STORM-1236
STORM-1259
+ STORM-899
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 84c560639e0..9a30979b9b1 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -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));
diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h
index 1f8d6d0c94e..271e36e87d5 100644
--- a/indra/newview/llcofwearables.h
+++ b/indra/newview/llcofwearables.h
@@ -106,7 +106,7 @@ class LLCOFWearables : public LLPanel
void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu);
- LLFlatListView* mAttachments;
+ LLFlatListViewEx* mAttachments;
LLFlatListView* mClothing;
LLFlatListView* mBodyParts;
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f438e3d42d3..bbeb592e962 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -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"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8c90106b79..f7599c70ff2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -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>
--
GitLab