diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:51:02 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:51:02 +0300 |
| commit | a4c6c7059ffc9c61bd66758dddee74383e112fe1 (patch) | |
| tree | 740e72af630ec1a75dd8949cfe1c67ea1076183c /indra/newview/skins/default/xui/en/panel_outfit_edit.xml | |
| parent | abf8c4b364bca97d4295797a14f459d85bef1714 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_outfit_edit.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfit_edit.xml | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index 3f7444dec3..d625f89f3b 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -81,7 +81,7 @@ name="title" text_color="LtGray" top="0" - value="Edit Outfit" + value="Edit outfit parts" use_ellipses="true" width="275" /> @@ -510,27 +510,31 @@ It is calculated as border_size + 2*UIResizeBarOverlap <button follows="bottom|left|right" height="23" - label="Save" + label="Save changes" left="1" layout="topleft" name="save_btn" top="0" width="155" /> - <button - follows="bottom|right" - height="23" - name="save_flyout_btn" - label="" - layout="topleft" - left_pad="-20" - tab_stop="false" - top="0" - image_selected="SegmentedBtn_Right_Selected_Press" - image_unselected="SegmentedBtn_Right_Off" - image_pressed="SegmentedBtn_Right_Press" - image_pressed_selected="SegmentedBtn_Right_Selected_Press" - image_overlay="Arrow_Small_Up" - width="20"/> + </layout_panel> + <layout_panel + follows="bottom|left|right" + height="23" + layout="bottomleft" + left_pad="3" + mouse_opaque="false" + name="save_as_btn_lp" + auto_resize="true" + width="156"> + <button + follows="bottom|left|right" + height="23" + label="Save as..." + layout="topleft" + name="save_as_btn" + top="0" + left="1" + width="155" /> </layout_panel> <layout_panel follows="bottom|left|right" |