From 0b200c1a3a03985b0dac897d33f70abf12755b7c Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Tue, 24 Nov 2009 18:25:26 -0800
Subject: [PATCH] Artwork for Stop and Zoom Out for the prim media controls
---
.../skins/default/textures/icons/Stop_Off.png | Bin 0 -> 148 bytes
.../skins/default/textures/icons/UnZoom_Off.png | Bin 0 -> 423 bytes
indra/newview/skins/default/textures/textures.xml | 6 ++++++
.../default/xui/en/panel_prim_media_controls.xml | 6 ++----
4 files changed, 8 insertions(+), 4 deletions(-)
create mode 100755 indra/newview/skins/default/textures/icons/Stop_Off.png
create mode 100755 indra/newview/skins/default/textures/icons/UnZoom_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Stop_Off.png b/indra/newview/skins/default/textures/icons/Stop_Off.png
new file mode 100755
index 0000000000000000000000000000000000000000..3ee215d36f3957b1607bf985e141005a83fa4e16
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X%sgEjLn>}1{rUgjo>{e_v(f25)0xDSlpF;&;R{!JBX}9S
tZd|_0y_l^>iotI$^SqfFW(*1k7?$+$M$Ry=;Q*Sz;OXk;vd$@?2>=X3E)4(x
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/icons/UnZoom_Off.png b/indra/newview/skins/default/textures/icons/UnZoom_Off.png
new file mode 100755
index 0000000000000000000000000000000000000000..c794113755046d7eef07ba2665deec0d75c8f500
GIT binary patch
literal 423
zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzNl8RORCwBA`2YVu0~Wvt#DWY207x$r
znix9}o3XL6g~Y_fL;%@AKx_iUtawd<Y1Y@*4?BDI>@1+zeh~ii=g;1gCr?gSQBm;+
z%ClhA3p2ph*4FvUmoHmknvwClckec6Yipa~^8(AXY11OOxw*Npxl&M2kbnC0=@HoE
zzy?%SR`LUFP{tQvrlzJ^K#Cb7v_Z~z`t+%cw6yeMumB_DR4h)-hB7^X@;{Nizz7Wk
z_P>AsZf0g?#u?hbe*OB+&d%<IH4H$e0u4Bd&kI+tUcCdPII)HS2ms@L^1pxoUf?o7
zQBhGI7*pQphQJK~y5b!Z6H^k9xe<t;LxrCL@j9TvcLW3k_%?3b7=vL5j--qph`c~A
z&Vr>0pdle3Lr@YDsfO6u*#(hg0J<SRfBsxZvH>tdfOrBB>msKEvH?JV0RY&h(eQnu
R!UzBW002ovPDHLkV1mp8wu%4%
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 99f6fc5cb30..f19f480d356 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -490,6 +490,9 @@ with the same filename but different name
<texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true" />
<texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true" />
+ <texture name="Stop_Off" file_name="icons/Stop_Off.png" preload="false" />
+ <texture name="Stop_Over" file_name="icons/Stop_Over.png" preload="false" />
+ <texture name="Stop_Press" file_name="icons/Stop_Press.png" preload="false" />
<texture name="StopReload_Off" file_name="icons/StopReload_Off.png" preload="false" />
<texture name="StopReload_Over" file_name="icons/StopReload_Over.png" preload="false" />
<texture name="StopReload_Press" file_name="icons/StopReload_Press.png" preload="false" />
@@ -607,6 +610,9 @@ with the same filename but different name
<texture name="Zoom_Off" file_name="icons/Zoom_Off.png" preload="false" />
<texture name="Zoom_Over" file_name="icons/Zoom_Over.png" preload="false" />
<texture name="Zoom_Press" file_name="icons/Zoom_Press.png" preload="false" />
+ <texture name="UnZoom_Off" file_name="icons/UnZoom_Off.png" preload="false" />
+ <texture name="UnZoom_Over" file_name="icons/UnZoom_Over.png" preload="false" />
+ <texture name="UnZoom_Press" file_name="icons/UnZoom_Press.png" preload="false" />
<!--WARNING OLD ART *do not use*-->
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 2e39236f65d..af4c01185ae 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -114,9 +114,8 @@
top="2"
min_width="22"
width="22">
- <!-- The stop button here is temporary artwork -->
<button
- image_overlay="media_btn_stoploading.png"
+ image_overlay="Stop_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
@@ -571,9 +570,8 @@ function="MediaCtrl.CommitURL" />
layout="topleft"
min_width="21"
width="21" >
- <!-- There is no "Zoom out" icon, so we use this temporarily -->
<button
- image_overlay="ForwardArrow_Off"
+ image_overlay="UnZoom_Off"
image_disabled="PushButton_Disabled"
image_disabled_selected="PushButton_Disabled"
image_selected="PushButton_Selected"
--
GitLab