EXT-923 Add new art to viewer. Create references to AddItem OptionsMenu and TrashItem Disabled states in xml. Link new art up in textures.xml.

7 files changed, 92 insertions, 86 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 824df082d8..4463d44049 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -35,14 +35,14 @@
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -331,14 +331,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -586,14 +586,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -814,14 +814,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1002,14 +1002,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1223,14 +1223,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1444,14 +1444,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1665,14 +1665,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -1886,14 +1886,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2119,14 +2119,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2340,14 +2340,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2561,14 +2561,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -2782,14 +2782,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3003,14 +3003,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
@@ -3305,14 +3305,14 @@ scratch and wear it.
          width="389">
             <icon
              follows="top|right"
-             height="16"
-             image_name="icon_lock.tga"
+             height="18"
+             image_name="Lock"
              layout="topleft"
              left="333"
              mouse_opaque="true"
              name="square"
              top="5"
-             width="16" />
+             width="18" />
             <icon
              height="16"
              layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 467168ebd8..10bcee7c85 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="294"
      mouse_opaque="true"
      name="IconLocked"
      top="5"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
@@ -410,7 +410,7 @@
      width="330">
         Mark Item:
     </text-->
-    
+
 
     <!--radio_group
      draw_border="false"
@@ -438,7 +438,7 @@
          top_delta="0"
          width="70" />
     </radio_group-->
-    
+
     <!--text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index a767b40b03..3e2045e1f7 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -29,14 +29,14 @@
     </floater.string>
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="340"
      mouse_opaque="true"
      name="lock"
      top="1"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index cb3ff92363..ef68478460 100644
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
@@ -26,14 +26,14 @@
      width="497" />
     <icon
      follows="top|right"
-     height="16"
-     image_name="icon_lock.tga"
+     height="18"
+     image_name="Lock"
      layout="topleft"
      left="444"
      mouse_opaque="true"
      name="lock"
      top="3"
-     width="16" />
+     width="18" />
     <text
      type="string"
      length="1"
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 6ba4d13117..311caa4866 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
@@ -16,28 +16,28 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-    
-    <button 
-     layout="topleft" 
-     name="back" 
-     right="-9" 
-     top="0" 
-     width="25" 
-     height="25" 
+
+    <button
+     layout="topleft"
+     name="back"
+     right="-9"
+     top="0"
+     width="25"
+     height="25"
      label=""
      follows="top|left"
      image_overlay="BackArrow_Off"
      tab_stop="false" />
-    <text 
-     layout="topleft" 
-     top="0" 
-     left="10" 
-     width="250" 
-     height="20" 
-     font="SansSerifHugeBold" 
-     text_color="white" 
+    <text
+     layout="topleft"
+     top="0"
+     left="10"
+     width="250"
+     height="20"
+     font="SansSerifHugeBold"
+     text_color="white"
      follows="top|left|right"
-     mouse_opaque="true" 
+     mouse_opaque="true"
      name="group_name">(Loading...)</text>
     <texture_picker
      follows="left|top"
@@ -81,15 +81,15 @@
      left="5"
      width="65" />
     <button
-	 top="632"
-	 left="75"	 
-	 height="20"
-     font="SansSerifSmall"
-     label="Refresh"
-     label_selected="Refresh"
+     follows="top|left"
+     height="20"
+     image_overlay="Refresh_Off"
+     layout="topleft"
      name="btn_refresh"
-	 follows="top|left"
-     width="65" />
+     picture_style="true"
+     top="632"
+     left="75"
+     width="20" />
     <button
      top="632"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3642b0fec1..efacac089e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -84,6 +84,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="nearby_view_sort_btn"
@@ -160,6 +161,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="friends_viewsort_btn"
@@ -173,6 +175,7 @@
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="add_btn"
@@ -186,6 +189,7 @@
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
+                 image_disabled="TrashItem_Disabled"
                  layout="topleft"
                  left_pad="180"
                  name="del_btn"
@@ -231,6 +235,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="gear_btn"
@@ -244,6 +249,7 @@
                  height="18"
                  image_selected="AddItem_Press"
                  image_unselected="AddItem_Off"
+                 image_disabled="AddItem_Disabled"
                  layout="topleft"
                  left_pad="5"
                  name="plus_btn"
@@ -290,7 +296,7 @@
          name="recent_panel"
          width="285">
             <avatar_list_tmp
-             color="DkGray2" 
+             color="DkGray2"
              follows="left|top|right|bottom"
              height="357"
              layout="topleft"
@@ -315,6 +321,7 @@
                  height="18"
                  image_selected="OptionsMenu_Press"
                  image_unselected="OptionsMenu_Off"
+                 image_disabled="OptionsMenu_Disabled"
                  layout="topleft"
                  left="20"
                  name="recent_viewsort_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 389d3dbbc7..bceaedcdb4 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -46,6 +46,7 @@
              height="18"
              image_selected="OptionsMenu_Press"
              image_unselected="OptionsMenu_Off"
+              image_disabled="OptionsMenu_Disabled"
              layout="topleft"
              left="10"
              name="gear_menu_btn"
@@ -56,8 +57,7 @@
              follows="bottom|left"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="AddItem_Off"
-             image_disabled_selected="AddItem_Press"
+             image_disabled="AddItem_Disabled"
              image_selected="AddItem_Press"
              image_unselected="AddItem_Off"
              layout="topleft"
@@ -71,8 +71,7 @@
              follows="bottom|right"
              font="SansSerifBigBold"
              height="18"
-             image_disabled="TrashItem_Off"
-             image_disabled_selected="TrashItem_Press"
+             image_disabled="TrashItem_Disabled"
              image_selected="TrashItem_Press"
              image_unselected="TrashItem_Off"
              layout="topleft"