From 9134ec0197cd53ad6a0690c2cbfda406c7d9dbcb Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 7 Jun 2011 16:43:38 -0400
Subject: STORM-899 'No attachments worn' text on blank 'Attachments' accordion
remains in English for all locales
---
indra/newview/llcofwearables.cpp | 8 +++++---
indra/newview/llcofwearables.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llcofwearables.cpp b/indra/newview/llcofwearables.cpp
index 9a30979b9b..254c0adef1 100644
--- a/indra/newview/llcofwearables.cpp
+++ b/indra/newview/llcofwearables.cpp
@@ -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())
{
diff --git a/indra/newview/llcofwearables.h b/indra/newview/llcofwearables.h
index 271e36e87d..1f8d6d0c94 100644
--- a/indra/newview/llcofwearables.h
+++ b/indra/newview/llcofwearables.h
@@ -106,7 +106,7 @@ protected:
void onListRightClick(LLUICtrl* ctrl, S32 x, S32 y, LLListContextMenu* menu);
- LLFlatListViewEx* mAttachments;
+ LLFlatListView* mAttachments;
LLFlatListView* mClothing;
LLFlatListView* mBodyParts;
--
cgit v1.2.3