diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
| commit | d08b0b6ae8bcd452a3d707ac153107d0f1523df8 (patch) | |
| tree | 3caac3468a18b105e5aa5eb53cd13ed416c1a48d /indra/newview/skins/default/xui/en/panel_edit_pants.xml | |
| parent | 087897b1f837872fc02822595e5dd47fabf3b7e8 (diff) | |
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_pants.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_pants.xml | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml new file mode 100644 index 0000000000..0748757c70 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> + <panel + follows="all" + height="400" + layout="topleft" + left="10" + name="edit_pants_panel" + top_pad="10" + width="313" > + <panel + border="true" + follows="left|top|right" + height="100" + left="10" + layout="topleft" + name="avatar_pants_color_panel" + top="0" + width="293" > + <texture_picker + can_apply_immediately="true" + default_image_name="Default" + follows="left|top" + height="80" + label="Fabric" + layout="topleft" + left="10" + name="Fabric" + tool_tip="Click to choose a picture" + top="10" + width="64" /> + <color_swatch + border_color="0.45098 0.517647 0.607843 1" + can_apply_immediately="true" + follows="left|top" + height="80" + label="Color/Tint" + layout="topleft" + left_pad="10" + name="Color/Tint" + tool_tip="Click to open Color Picker" + top="10" + width="64" /> + </panel> + <accordion + follows="left|top|right|bottom" + height ="340" + left="10" + name="wearable_accordion" + top_pad="10" + width="303"> + <accordion_tab + can_resize="false" + layout="topleft" + min_height="150" + name="pants_main_tab" + title="Pants"> + <scrolling_panel_list + draw_heading="false" + follows="all" + left="0" + name="pants_main_param_list" + top="0" + width="303" /> + </accordion_tab> + </accordion> +</panel> + |