EXT-7200 FIXED Integrated art missing from appearance.

Most changes are in xml, but changing of view buttons overlay icons in lists from add wearables is implemented in code. Dragbar icon was only added as file, it will be integrated in EXT-7255 (There is no dragbar between 'Edit Outfit' and 'Add to Outfit:' panels).

Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/

--HG--
branch : product-engine

5 files changed, 38 insertions, 29 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 115964e5f2..e3f6045e27 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -52,18 +52,17 @@
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_name="Lock2"
-     top="0"
+     image_name="Locked_Icon"
+     top="2"
      left="0"
-     height="20"
-     width="20"
+     height="13"
+     width="9"
      tab_stop="false" />
     <button 
      name="btn_edit"
      layout="topleft"
      follows="top|right"
-     image_unselected="Icon_Gear_Background"
-     image_selected="Icon_Gear_Background"
+     image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 7cc9c46c08..b1782f405e 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -63,8 +63,7 @@
      name="btn_move_up"
      layout="topleft"
      follows="top|right"
-     image_unselected="Movement_Up_Off"
-     image_selected="Movement_Up_Off"
+     image_overlay="UpArrow_Off"
      top="0"
      left="0"
      height="20"
@@ -74,8 +73,7 @@
      name="btn_move_down"
      layout="topleft"
      follows="top|right"
-     image_unselected="Movement_Down_Off"
-     image_selected="Movement_Down_Off"
+     image_overlay="DownArrow_Off"
      top="0"
      left_pad="3"
      height="20"
@@ -85,17 +83,16 @@
      name="btn_lock"
      layout="topleft"
      follows="top|right"
-     image_name="Lock2"
-     top="0"
-     left_pad="3"
-     height="20"
-     width="20" />
+     image_name="Locked_Icon"
+     top="2"
+     left_pad="1"
+     height="13"
+     width="9" />
     <button 
      name="btn_edit"
      layout="topleft"
      follows="top|right"
-     image_unselected="Icon_Gear_Background"
-     image_selected="Icon_Gear_Background"
+     image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index c5a60ced88..c5fbd1cae6 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -53,7 +53,7 @@
      name="btn_add"
      layout="topleft"
      follows="top|right"
-     label="+"
+     image_overlay="AddItem_Off"
      top="0"
      left="0"
      height="20"
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 9072418329..454a808f02 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -21,6 +21,22 @@
     <string
      name="now_editing"
      value="Now Editing"/>
+    <string
+     name="folder_view_off"
+     value="Hierarchy_View_Disabled"
+     translate="false"/>
+    <string
+     name="folder_view_on"
+     value="Hierarchy_View_On"
+     translate="false"/>
+    <string
+     name="list_view_off"
+     value="List_View_Disabled"
+     translate="false"/>
+    <string
+     name="list_view_on"
+     value="List_View_On"
+     translate="false"/>
 	
 	<panel.string
 		name="not_available">
@@ -88,15 +104,15 @@
      width="311">
         <icon
          follows="left|top"
-         height="40"
-         image_name="TabIcon_Appearance_Off"
+         height="31"
+         image_name="Shirt_Large"
          left="2"
          mouse_opaque="false"
          name="outfit_icon"
-         top="1"
+         top="2"
          scale_image="true"
          visible="true"
-         width="35" />
+         width="31" />
             <panel
              bevel_style="none"
              follows="top|right"
@@ -231,11 +247,10 @@
              follows="top|left|right"
              height="20"
              image_hover_unselected="Toolbar_Middle_Over"
-             image_overlay=""
+             image_overlay="Search_Icon"
              image_selected="Toolbar_Middle_Selected"
              image_unselected="Toolbar_Middle_Off"
              is_toggle="true"
-             label="O"
              layout="topleft"
              left_pad="5"
              name="filter_button"
@@ -356,11 +371,10 @@
                  follows="bottom|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
+                 image_overlay="Hierarchy_View_Disabled"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  is_toggle="true"
-                 label="F"
                  layout="topleft"
                  left_pad="1"
                  name="folder_view_btn"
@@ -370,11 +384,10 @@
                  follows="bottom|left"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay=""
+                 image_overlay="List_View_On"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  is_toggle="true"
-                 label="L"
                  layout="topleft"
                  left_pad="1"
                  name="list_view_btn"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 32fa6c3b5a..5a6b3ec096 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -87,7 +87,7 @@ width="333">
       <button
       follows="left|top"
       height="20"
-      image_overlay="windows/Icon_Gear_Over.png"
+      image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
       left="265"