summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-10 14:28:46 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-10 14:28:46 -0800
commitc680368e19f5be7265e2f15a1f4b626b1600e773 (patch)
tree8a38590b168d8b65e2d185ba76ada2de17d4b2e0 /indra/newview/skins/default
parent3aa7e1b0c10fcb660cfc13308dd2a45223696e11 (diff)
EXT-5261 EXT-5263 EXT-5265 EXT-5266 EXT-5271 - Reformat NMF and enable behavior of media toggle in chrome
Review #100 http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=100 This encompasses the first of the behavioral and structural changes for the Nearby Media Floater and the chrome button at the top of the UI. It includes: - Removal of the Parcel Media and Parcel Audio UI. Still not in the list yet. - New More/Less button, which doesn't quite work right (see below) - Changed icon for UI chrome - Enabled "turning on" and "turning off" media from the chrome and NMF - Added gear icon to bring up prefs - XUI changes to the structure of NMF - Implementation of the "tentative" autoplay flag This is basically a checkpoint so that Richard can help with the More/Less implementation
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml9
1 files changed, 4 insertions, 5 deletions
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 77eb9f2a75..96c61b69f5 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -94,10 +94,10 @@
<button
follows="right|top"
height="15"
- image_selected="button_anim_play.tga"
- image_unselected="button_anim_pause.tga"
- image_pressed="button_anim_pause_selected.tga"
- image_pressed_selected="button_anim_play_selected.tga"
+ image_selected="Pause_Off"
+ image_unselected="Play_Off"
+ image_pressed="Play_Press"
+ image_pressed_selected="Pause_Press"
is_toggle="true"
left_pad="15"
top="2"
@@ -105,7 +105,6 @@
tool_tip="Click to toggle media"
width="16" >
</button>
-
<button
follows="right|top"
height="15"