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

merge changes for storm-653 and storm-1737

meow-7.2.2
Oz Linden 2011-12-20 09:20:36 -05:00
parent 540dc4b955 4c8d00d1d3
commit 2667c6a80f
8 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BuildParams
View File

@ -145,6 +145,17 @@ oz_viewer-devreview.codeticket_add_context = false
oz_viewer-devreview.build_enforce_coding_policy = true
oz_viewer-devreview.email = oz@lindenlab.com
oz_viewer-trial.build_debug_release_separately = true
oz_viewer-trial.codeticket_add_context = false
oz_viewer-trial.build_enforce_coding_policy = true
oz_viewer-trial.email = oz@lindenlab.com
oz_viewer-beta-review.build_debug_release_separately = true
oz_viewer-beta-review.codeticket_add_context = false
oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.email = oz@lindenlab.com
oz_project-1.build_debug_release_separately = true
oz_project-1.codeticket_add_context = false
oz_project-1.email = oz@lindenlab.com
@ -157,15 +168,6 @@ oz_project-3.email = oz@lindenlab.com
oz_project-4.build_debug_release_separately = true
oz_project-4.codeticket_add_context = false
oz_project-4.email = oz@lindenlab.com
oz_project-5.build_debug_release_separately = true
oz_project-5.codeticket_add_context = false
oz_project-5.email = oz@lindenlab.com
oz_viewer-beta-review.build_debug_release_separately = true
oz_viewer-beta-review.codeticket_add_context = false
oz_viewer-beta-review.viewer_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.login_channel = "Second Life Beta Viewer"
oz_viewer-beta-review.email = oz@lindenlab.com
# =================================================================
# asset delivery 2010 projects

2
doc/contributions.txt
View File

@ -599,6 +599,8 @@ Jonathan Yap
STORM-1728
STORM-1736
STORM-1731
STORM-653
STORM-1737
STORM-1733
Kadah Coba
STORM-1060

14
indra/newview/llcofwearables.cpp
View File

@ -328,6 +328,19 @@ BOOL LLCOFWearables::postBuild()
return LLPanel::postBuild();
}
void LLCOFWearables::setAttachmentsTitle()
{
if (mAttachmentsTab)
{
U32 free_slots = MAX_AGENT_ATTACHMENTS - mAttachments->size();
LLStringUtil::format_map_t args_attachments;
args_attachments["[COUNT]"] = llformat ("%d", free_slots);
std::string attachments_title = LLTrans::getString("Attachments remain", args_attachments);
mAttachmentsTab->setTitle(attachments_title);
}
}
void LLCOFWearables::onSelectionChange(LLFlatListView* selected_list)
{
if (!selected_list) return;
@ -490,6 +503,7 @@ 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)
setAttachmentsTitle();
}
else
{

2
indra/newview/llcofwearables.h
View File

@ -91,6 +91,8 @@ public:
*/
void selectClothing(LLWearableType::EType clothing_type);
void setAttachmentsTitle();
protected:
void populateAttachmentsAndBodypartsLists(const LLInventoryModel::item_array_t& cof_items);

6
indra/newview/llpaneleditwearable.cpp
View File

@ -356,9 +356,9 @@ LLEditWearableDictionary::ColorSwatchCtrls::ColorSwatchCtrls()
LLEditWearableDictionary::TextureCtrls::TextureCtrls()
{
addEntry ( TEX_HEAD_BODYPAINT, new PickerControlEntry (TEX_HEAD_BODYPAINT, "Head Tattoos", LLUUID::null, TRUE ));
addEntry ( TEX_UPPER_BODYPAINT, new PickerControlEntry (TEX_UPPER_BODYPAINT, "Upper Tattoos", LLUUID::null, TRUE ));
addEntry ( TEX_LOWER_BODYPAINT, new PickerControlEntry (TEX_LOWER_BODYPAINT, "Lower Tattoos", LLUUID::null, TRUE ));
addEntry ( TEX_HEAD_BODYPAINT, new PickerControlEntry (TEX_HEAD_BODYPAINT, "Head", LLUUID::null, TRUE ));
addEntry ( TEX_UPPER_BODYPAINT, new PickerControlEntry (TEX_UPPER_BODYPAINT, "Upper Body", LLUUID::null, TRUE ));
addEntry ( TEX_LOWER_BODYPAINT, new PickerControlEntry (TEX_LOWER_BODYPAINT, "Lower Body", LLUUID::null, TRUE ));
addEntry ( TEX_HAIR, new PickerControlEntry (TEX_HAIR, "Texture", LLUUID( gSavedSettings.getString( "UIImgDefaultHairUUID" ) ), FALSE ));
addEntry ( TEX_EYES_IRIS, new PickerControlEntry (TEX_EYES_IRIS, "Iris", LLUUID( gSavedSettings.getString( "UIImgDefaultEyesUUID" ) ), FALSE ));
addEntry ( TEX_UPPER_SHIRT, new PickerControlEntry (TEX_UPPER_SHIRT, "Fabric", LLUUID( gSavedSettings.getString( "UIImgDefaultShirtUUID" ) ), FALSE ));

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

@ -37,6 +37,7 @@
top="0"
width="311" />
</accordion_tab>
<!-- The Attachments title is overwritten by the definition of "Attachments remain" in strings.xml -->
<accordion_tab
layout="topleft"
name="tab_attachments"

12
indra/newview/skins/default/xui/en/panel_edit_skin.xml
View File

@ -27,10 +27,10 @@
default_image_name="Default"
follows="left|top"
height="80"
label="Head Tattoos"
label="Head"
layout="topleft"
left="25"
name="Head Tattoos"
name="Head"
tool_tip="Click to choose a picture"
top="10"
width="74" >
@ -43,10 +43,10 @@
default_image_name="Default"
follows="left|top"
height="80"
label="Upper Tattoos"
label="Upper body"
layout="topleft"
left_pad="20"
name="Upper Tattoos"
name="Upper Body"
tool_tip="Click to choose a picture"
top="10"
width="74" >
@ -59,10 +59,10 @@
default_image_name="Default"
follows="left|top"
height="80"
label="Lower Tattoos"
label="Lower body"
layout="topleft"
left_pad="20"
name="Lower Tattoos"
name="Lower Body"
tool_tip="Click to choose a picture"
top="10"
width="74" >

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

@ -2133,6 +2133,7 @@ Returns a string with the requested data about the region
<string name="InvFolder All">All</string>
<string name="no_attachments">No attachments worn</string>
<string name="Attachments remain">Attachments ([COUNT] slots remain)</string>
<!-- inventory FVBridge -->
<!-- This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale -->