WENG-1470 (Partial) Secondlife Login Screen Redesign - added new button images

7 files changed, 15 insertions, 10 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 605053722d..c563726c85 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -486,8 +486,9 @@ with the same filename but different name
   <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" />
 
-  <texture name="PushButton_Login_On" file_name="widgets/PushButton_Login_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
-  <texture name="PushButton_Login_On_Selected" file_name="widgets/PushButton_Login_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login" file_name="widgets/PushButton_Login.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login_Over" file_name="widgets/PushButton_Login_Over.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="PushButton_Login_Pressed" file_name="widgets/PushButton_Login_Pressed.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
 
 
   <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
index 6f8b5a0770..6f8b5a0770 100644
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png
deleted file mode 100644
index 6f8b5a0770..0000000000
--- a/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
new file mode 100644
index 0000000000..e9e8af13d4
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
new file mode 100644
index 0000000000..4a9f1052b3
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d37cc24243..6d4085c455 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -78,8 +78,9 @@
   </text>

   <button

     follows="left|top"

-    image_unselected="PushButton_Login_On"

-    image_selected="PushButton_Login_On_Selected"

+    image_unselected="PushButton_Login"

+    image_pressed="PushButton_Login_Pressed"

+    image_hover="PushButton_Login_Over"

     label="Log In"

     label_color="White"

     font="SansSerifMedium"

@@ -117,8 +118,9 @@
   </combo_box>

   <button

     follows="left|top"

-    image_unselected="PushButton_Login_On"

-    image_selected="PushButton_Login_On_Selected"

+    image_unselected="PushButton_Login"

+    image_pressed="PushButton_Login_Pressed"

+    image_hover="PushButton_Login_Over"

     label="Log In"

     label_color="White"

     font="SansSerifMedium"

@@ -141,8 +143,9 @@
     bottom_delta="0" />

   <button

     follows="left|top"

-    image_unselected="PushButton_Login_On"

-    image_selected="PushButton_Login_On_Selected"

+    image_unselected="PushButton_Login"

+    image_pressed="PushButton_Login_Pressed"

+    image_hover="PushButton_Login_Over"

     label="Log In"

     label_color="White"

     font="SansSerifMedium"

diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index 2ad5afe956..81cb98c697 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -131,8 +131,9 @@
             top="0" />

           <button

             follows="left|top"

-            image_unselected="PushButton_Login_On"

-            image_selected="PushButton_Login_On_Selected"

+            image_unselected="PushButton_Login"

+            image_pressed="PushButton_Login_Pressed"

+            image_hover="PushButton_Login_Over"

             label="Log In"

             label_color="White"

             font="SansSerifLarge"