diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 09:56:59 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 09:56:59 -0800 |
| commit | b8a046f7d9a59c58b98fa981ae2e27e69f8c28b5 (patch) | |
| tree | 17fcdbc37ae00c680f4071cc3f19a4ff5676f4a7 /indra/newview | |
| parent | 51b720de9e0b8eadd7cc1d86a8fd6b97d0caa870 (diff) | |
| parent | d61ef312a2124bd09c499f5faaa1fe8b8b12510f (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
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" |