diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 13:38:54 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-15 13:38:54 -0800 |
| commit | c0f087eb8672c3e8c6615b7700e6255b78efed65 (patch) | |
| tree | 883146dd944c52a420a8294f3fd302702d2af828 /indra/newview/skins/default/xui/en | |
| parent | 7590704e0e93b48f897c47dba07916efebd95274 (diff) | |
| parent | 4858789050411a152a35685f1e0282061800faeb (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 10 |
2 files changed, 15 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 1c1e17eb5a..a8e24366f2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -77,10 +77,23 @@ name="cookies_enabled" top_pad="10" width="350" /> - <check_box + <check_box + control_name="MediaEnabled" + height="16" + label="Media Enabled" + layout="topleft" + left="30" + name="media_enabled" + top_pad="10" + width="350"> + <check_box.commit_callback + function="Pref.MediaEnabled" /> + </check_box> + <check_box + enabled_control="MediaEnabled" control_name="ParcelMediaAutoPlayEnable" height="16" - label="Allow Media Autoplay" + label="Allow Media to auto-play" layout="topleft" left="30" name="autoplay_enabled" 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 ab6384203f..9164ff4c29 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 @@ -131,7 +131,6 @@ hover_glow_amount="0.15" top="0" height="22" - min_width="22" width="22" layout="topleft" tool_tip="Navigate forward"> @@ -161,7 +160,6 @@ tool_tip="Home page" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Home" /> @@ -189,7 +187,6 @@ tool_tip="Stop media" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.MediaStop" /> @@ -217,7 +214,6 @@ tool_tip="Reload" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Reload" /> @@ -245,7 +241,6 @@ tool_tip = "Stop loading" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Stop" /> @@ -274,7 +269,6 @@ left_delta="2" top="0" height="22" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Play" /> @@ -449,7 +443,6 @@ layout="topleft" tool_tip="Step forward" top="0" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.SkipForward" /> @@ -483,7 +476,6 @@ tool_tip="Mute This Media" top="0" height="20" - min_width="22" width="22" > <button.commit_callback function="MediaCtrl.ToggleMute" /> @@ -534,7 +526,6 @@ height="22" layout="topleft" tool_tip="Zoom into media" - min_width="22" width="22"> <button.commit_callback function="MediaCtrl.Zoom" /> @@ -588,7 +579,6 @@ layout="topleft" tool_tip = "Open URL in browser" top="0" - min_width="24" width="24" > <button.commit_callback function="MediaCtrl.Open" /> |