summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-25 00:54:35 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-06-25 00:54:35 +0300
commit7f19c512c9593dd925467a2bc75ad4cf0c3dbca9 (patch)
tree45a84ad8de373e0f68963d6685df4683dff09430 /indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
parent88ac2812b421f1eb5ab2af6fb793b23025da29a4 (diff)
parent467d8339c970c253dada2cf0e1eed45be66593ac (diff)
Merge branch 'master' into DRTVWR-522-maint
# Conflicts: # indra/newview/app_settings/settings.xml
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_outfits_inventory.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml39
1 files changed, 22 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 6c8cc9d39a..7b898dbd7f 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -100,28 +100,33 @@
<button
follows="bottom|left|right"
height="23"
- label="Save As"
+ 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"
- 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
+ </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"
height="23"
layout="bottomleft"