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

merge changes for storm-899

meow-7.2.2
Oz Linden 2011-06-15 11:56:18 -04:00
parent b6e69570dc 9134ec0197
commit 83cb59e45b
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -442,6 +442,7 @@ Jonathan Yap
STORM-1095
STORM-1236
STORM-1259
STORM-899
STORM-1273
Kage Pixel
VWR-11

5
indra/newview/llcofwearables.cpp
View File

@ -317,7 +317,6 @@ BOOL LLCOFWearables::postBuild()
mAttachments->setComparator(&WEARABLE_NAME_COMPARATOR);
mBodyParts->setComparator(&WEARABLE_NAME_COMPARATOR);
mClothingTab = getChild<LLAccordionCtrlTab>("tab_clothing");
mClothingTab->setDropDownStateChangedCallback(boost::bind(&LLCOFWearables::onAccordionTabStateChanged, this, _1, _2));
@ -499,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())
{

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

@ -2101,6 +2101,8 @@ Returns a string with the requested data about the region
<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>