#5521 Don't use the old shaded button texture

7 files changed, 12 insertions, 13 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 6c0a3e3d0d..2e655da82c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -559,8 +559,7 @@ with the same filename but different name
   <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Over" file_name="widgets/PushButton_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Selected" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index 5406497930..c43f82c0f1 100644
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -109,7 +109,7 @@
                  image_overlay_alignment="center"
                  image_pressed="WellButton_Lit"
                  image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
+                 image_selected="PushButton_Selected"
                  label_color="Black"
                  left="0"
                  name="Unread"
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 a0e3344304..4cd9d27841 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -216,7 +216,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                     <button
                             follows="left|bottom"
                             height="22"
-                            image_pressed="PushButton_Press"
+                            image_pressed="PushButton_Selected"
                             image_pressed_selected="PushButton_Selected_Press"
                             image_selected="PushButton_Selected_Press"
                             is_toggle="true"
@@ -251,7 +251,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                             follows="bottom|right"
                             height="22"
                             image_overlay="Search_Icon"
-                            image_pressed="PushButton_Press"
+                            image_pressed="PushButton_Selected"
                             image_pressed_selected="PushButton_Selected_Press"
                             image_selected="PushButton_Selected_Press"
                             is_toggle="true"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
index 9f930d1557..1bea605d91 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_autoadjustments.xml
@@ -144,7 +144,7 @@
   <button
    follows="top|left"
    height="22"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    label="Auto-adjust now"
@@ -157,7 +157,7 @@
   <button
    follows="top|left"
    height="22"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    label="Cancel"
@@ -183,7 +183,7 @@
    follows="top|left"
    height="20"
    initial_value="true"
-   image_pressed="PushButton_Press"
+   image_pressed="PushButton_Selected"
    image_pressed_selected="PushButton_Selected_Press"
    image_selected="PushButton_Selected_Press"
    is_toggle="true"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index b290706271..2d3a8618ed 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -102,7 +102,7 @@
      follows="right|top|bottom"
      image_hover_unselected="PushButton_Over"
      image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      height="18"
      label="Buy L$"
      label_color="White"
@@ -122,7 +122,7 @@
      image_overlay_alignment="left"
      image_hover_unselected="PushButton_Over"
      image_unselected="PushButton_Off"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      height="18"
      label="Shop"
      label_color="White"
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
index 14cd3e159c..499152f060 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
@@ -10,7 +10,7 @@
      mouse_opaque="false"
      scale_image="true"
      image_selected="PushButton_Selected_Press"
-     image_pressed="PushButton_Press"
+     image_pressed="PushButton_Selected"
      image_pressed_selected="PushButton_Selected_Press"
      image_unselected="PushButton_Off"
      image_disabled="PushButton_Disabled"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 8d71ffbfb5..aa2b60dc77 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -15,7 +15,7 @@
   <button_icon_and_text imgoverlay_label_space="7"
                         label_color_selected="White"
                         halign="left"
-                        image_pressed="PushButton_Press"
+                        image_pressed="PushButton_Selected"
                         image_pressed_selected="PushButton_Selected_Press"
                         image_selected="PushButton_Selected_Press"
                         image_disabled_selected="PushButton_Selected_Disabled"
@@ -38,7 +38,7 @@
                pad_right="10"
                image_bottom_pad="10"
                image_top_pad="10"
-               image_pressed="PushButton_Press"
+               image_pressed="PushButton_Selected"
                image_pressed_selected="PushButton_Selected_Press"
                image_selected="PushButton_Selected_Press"
                image_disabled_selected="PushButton_Selected_Disabled"