diff options
| -rwxr-xr-x | indra/newview/skins/default/textures/icons/Stop_Off.png | bin | 0 -> 148 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/icons/UnZoom_Off.png | bin | 0 -> 423 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/skins/default/textures/icons/Stop_Off.png b/indra/newview/skins/default/textures/icons/Stop_Off.png Binary files differnew file mode 100755 index 0000000000..3ee215d36f --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Stop_Off.png diff --git a/indra/newview/skins/default/textures/icons/UnZoom_Off.png b/indra/newview/skins/default/textures/icons/UnZoom_Off.png Binary files differnew file mode 100755 index 0000000000..c794113755 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/UnZoom_Off.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 99f6fc5cb3..f19f480d35 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 2e39236f65..af4c01185a 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" |
