diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 09:34:04 -0800 | 
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 09:34:04 -0800 | 
| commit | d61ef312a2124bd09c499f5faaa1fe8b8b12510f (patch) | |
| tree | 77489f557ec3d53245b8ecba905618f800019735 /indra/newview | |
| parent | 7bfa11ed694f9fffa9d8983f3d60f740d630cfc2 (diff) | |
DEV-41568 - implement parcel media controls in the nearby media floater
Review #42
This implements the parcel media controls in the nearby media floater, including:
- Play, Pause, Stop, Volume, and Mute
- Correct update of the parcel media name
- Parcel Audio (which is currently broken, so I cannot test it)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 6 | 
1 files changed, 3 insertions, 3 deletions
| 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 88049fe7d1..0aa05bc0f9 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 @@ -417,8 +417,8 @@ function="MediaCtrl.CommitURL" />  		height="22"  		min_width="22"  		width="22"> -	  <!-- Note: this isn't quite right either...the mute button is not the --> -	  <!-- same as the others because it can't have the "image_overlay" be  --> +	  <!-- Note: this is not quite right either...the mute button is not the --> +	  <!-- same as the others because it cannot have the "image_overlay" be  -->  	  <!-- two different images.  -->  	  <button  		  image_disabled="PushButton_Disabled" @@ -439,7 +439,7 @@ function="MediaCtrl.CommitURL" />  			function="MediaCtrl.ToggleMute" />  	  </button>  	</layout_panel> -	<!-- We don't have a design yet for "volume", so this is a temporary --> +	<!-- We do not have a design yet for "volume", so this is a temporary -->  	<!-- solution.  See DEV-42827. -->  	<layout_panel  		name="volume_up" | 
