diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 16ce77b6bfcc20f0e7ff06e11e63f2ce77449142..1e4dc15c565f1cbcc41914f825c9bc3664b18076 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -552,9 +552,9 @@ with the same filename but different name
<texture name="TabTop_Divider" file_name="containers/TabTop_Divider.png" preload="false" />
<texture name="TabTop_Left_Press" file_name="containers/TabTop_Left_Press.png" preload="false" />
<texture name="TabTop_Middle_Press" file_name="containers/TabTop_Middle_Press.png" preload="false" />
- <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" />
+ <texture name="TabTop_Right_Off" file_name="containers/TabTop_Right_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
<texture name="TabTop_Right_Press" file_name="containers/TabTop_Right_Press.png" preload="false" />
- <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" />
+ <texture name="TabTop_Right_Selected" file_name="containers/TabTop_Right_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="62" scale.bottom="9" />
<texture name="TabTop_Middle_Off" file_name="containers/TabTop_Middle_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
<texture name="TabTop_Middle_Selected" file_name="containers/TabTop_Middle_Selected.png" preload="false" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9" />
<texture name="TabTop_Left_Off" file_name="containers/TabTop_Left_Off.png" preload="false" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9" />
@@ -574,7 +574,6 @@ with the same filename but different name
<texture name="TimeBasedMediaBackground" file_name="windows/TimeBasedMediaBackground.png" preload="false" />
-
<texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
<texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
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 7e512f95947300b1f3a8d1c0e47002c742869d99..614a2e2ffe87fbdbeb7f1ffd528a1e125a7284bc 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-
<panel name="Outfits"
background_visible="true"
follows="all"
@@ -8,7 +7,7 @@
layout="topleft"
min_height="350"
min_width="240"
- width="330"
+ width="320"
border="false">
<tab_container
follows="all"
@@ -16,24 +15,28 @@
layout="topleft"
left="10"
name="appearance_tabs"
- tab_min_width="100"
+ tab_min_width="140"
tab_height="30"
tab_position="top"
halign="center"
width="313">
<inventory_panel
+ follows="all"
+ background_visible="true"
+ background_opaque="true"
label="WEARING"
help_topic="now_wearing_tab"
allow_multi_select="true"
border="false"
- height="500"
- width="290"
left="0"
top="0"
mouse_opaque="true"
name="cof_accordionpanel"
- start_folder="Current Outfit" />
+ start_folder="Current Outfit"
+ width="313" />
<inventory_panel
+ background_visible="true"
+ background_opaque="true"
label="MY OUTFITS"
help_topic="my_outfits_tab"
allow_multi_select="true"
@@ -41,11 +44,10 @@
border="false"
left="0"
top="0"
- height="500"
- width="290"
+ width="314"
mouse_opaque="true"
name="outfitslist_accordionpanel"
- start_folder="My Outfits" />
+ start_folder="My Outfits" />
</tab_container>
<panel
background_visible="true"
@@ -80,35 +82,26 @@
tool_tip="Remove selected item"
top="6"
width="18" />
- <button
- follows="bottom|left"
- height="23"
- label="Edit Look"
- layout="topleft"
- left="10"
- name="look_edit_btn"
- top="26"
- visible="false"
- width="90" />
<button
follows="bottom|left"
- height="23"
- label="Make Outfit"
+ height="23"
+ label="Make Outfit"
layout="topleft"
name="make_outfit_btn"
tool_tip="Save appearance as an outfit"
top="26"
- right="-110"
- width="90" />
+ left='10'
+ width="120" />
<button
- follows="bottom|right"
- height="23"
+ follows="bottom|right"
+ height="23"
label="Wear"
layout="topleft"
name="wear_btn"
right="-10"
+ left_pad="10"
top="26"
tool_tip="Wear selected outfit"
- width="90" />
+ width="120" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 44248eedd52d8b0a55f709370aaf0d80af0211a7..eb95d61865870889a24caf9206e7ec55b8884052 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -52,25 +52,26 @@ width="333">
text_color="white"
top="3"
use_ellipses="true"
- width="290"
+ width="305"
follows="top|left"
word_wrap="true"
mouse_opaque="false"
name="currentlook_name">
MyOutfit With a really Long Name like MOOSE
</text>
- <!-- <text
- text_color="LtGray_50"
- width="290"
- left="40"
+ <!--MERGING PERSON! TAKE THIS BIT BELOW FROM THE AVATAR BRANCH! TY -ERICA -->
+ <!-- <text
+ font="SansSerifSmall"
+ text_color="White_50"
+ width="300"
height="1"
follows="top|left"
layout="topleft"
- top_pad="-2"
+ top_pad="5"
mouse_opaque="false"
name="currentlook_title" >
- (current outfit)
- </text>-->
+ (current outfit) OR (unsaved)
+ </text>-->
</panel>
<filter_editor
height="23"
@@ -80,18 +81,18 @@ width="333">
label="Filter Outfits"
max_length="300"
name="Filter"
- top_pad="0"
+ top_pad="10"
width="303" />
<panel
class="panel_outfits_inventory"
filename="panel_outfits_inventory.xml"
name="panel_outfits_inventory"
- height="515"
+ height="505"
min_height="410"
width="320"
+ left="0"
top_pad="0"
- follows="all"
- />
+ follows="all" />
<!-- <button
follows="bottom|left"
height="23"
@@ -120,4 +121,3 @@ width="333">
top="35"
visible="false" />
</panel>
-