summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_wearable.xml13
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml3
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml34
3 files changed, 30 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index fc1caca9e9..484617df34 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -131,19 +131,25 @@
name="tattoo_desc_text">
Tattoo:
</string>
- <button
+ <!-- Default width of the button should be to show it without label.
+ Button will be extedned in code to show whole label when wearable is being changed.
+ -->
+ <labeled_back_button
follows="top|left"
height="24"
image_hover_unselected="BackButton_Over"
image_pressed="BackButton_Press"
image_unselected="BackButton_Off"
layout="topleft"
+ label="Save"
left="11"
name="back_btn"
+ pad_left="24"
+ tool_tip="Return to Edit Outfit"
top="3"
width="30" />
<text
- follows="top|left"
+ follows="top|left|right"
font="SansSerifHugeBold"
height="22"
layout="topleft"
@@ -152,7 +158,8 @@
text_color="white"
top="3"
value="Editing Shape"
- width="270" />
+ use_ellipses="true"
+ width="274" />
<panel
background_opaque="true"
background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index e894fc8fb8..2fbe4510e1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -96,6 +96,7 @@ background_visible="true"
follows="all"
layout="topleft"
auto_resize="true"
+ height="513"
width="313">
<accordion
left="0"
@@ -105,6 +106,7 @@ background_visible="true"
follows="all"
layout="topleft"
name="groups_accordion"
+ height="513"
width="313">
<accordion_tab
expanded="true"
@@ -182,6 +184,7 @@ background_visible="true"
top_pad="0"
name="button_row"
follows="bottom|left"
+ height="23"
width="313">
<button
follows="bottom|left"
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 4abd7dceac..362fdd606a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -190,7 +190,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
<layout_panel
auto_resize="true"
background_visible="true"
- bg_alpha_color="DkGray2"
+ bg_alpha_color="Black"
layout="topleft"
height="154"
name="add_button_and_combobox"
@@ -318,13 +318,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap
background_visible="false"
border="false"
follows="left|top|right|bottom"
- height="442"
+ height="449"
layout="topleft"
left="0"
mouse_opaque="false"
name="folder_view"
- top_pad="5"
- width="310"
+ top_pad="0"
+ width="313"
visible="false"/>
<panel
name="filtered_wearables_panel"
@@ -346,7 +346,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
layout="topleft"
follows="all"
multi_select="true"
- width="310"
+ width="313"
height="449"
left="0"
top="0"/>
@@ -382,20 +382,20 @@ It is calculated as border_size + 2*UIResizeBarOverlap
<icon
follows="bottom|left|right"
height="25"
- image_name="Toolbar_Right_Off"
+ image_name="Toolbar_Middle_Off"
layout="topleft"
left_pad="1"
name="dummy_right_icon"
- width="246" />
+ width="250" />
<button
follows="bottom|right"
height="25"
- image_hover_unselected="Toolbar_Middle_Over"
+ image_hover_unselected="Toolbar_Right_Over"
image_overlay="Shop"
- image_selected="Toolbar_Middle_Selected"
- image_unselected="Toolbar_Middle_Off"
+ image_selected="Toolbar_Right_Selected"
+ image_unselected="Toolbar_Right_Off"
layout="topleft"
- left_pad="0"
+ left_pad="1"
name="shop_btn_1"
top="1"
width="31" />
@@ -468,21 +468,21 @@ It is calculated as border_size + 2*UIResizeBarOverlap
<icon
follows="bottom|left|right"
height="25"
- image_name="Toolbar_Right_Off"
+ image_name="Toolbar_Middle_Off"
layout="topleft"
left_pad="1"
name="dummy_right_icon"
- width="153" >
+ width="154" >
</icon>
<button
follows="bottom|right"
height="25"
- image_hover_unselected="Toolbar_Middle_Over"
+ image_hover_unselected="Toolbar_Right_Over"
image_overlay="Shop"
- image_selected="Toolbar_Middle_Selected"
- image_unselected="Toolbar_Middle_Off"
+ image_selected="Toolbar_Right_Selected"
+ image_unselected="Toolbar_Right_Off"
layout="topleft"
- left_pad="0"
+ left_pad="1"
name="shop_btn_2"
top="1"
width="31" />