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

merge changes for storm-1737

meow-7.2.2
Oz Linden 2011-12-19 13:16:01 -05:00
parent 399bd5643c 5226629883
commit a336f1ee39
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -596,6 +596,7 @@ Jonathan Yap
STORM-1712
STORM-1728
STORM-653
STORM-1737
Kadah Coba
STORM-1060
Jondan Lundquist

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 ));

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" >