diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
commit | 073ec70829723e54f822052fe9c6c3e998e8dfca (patch) | |
tree | 3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | |
parent | 4d4406820b858d59be670f0ca03bdadefba61c53 (diff) | |
parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_prim_media_controls.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 11 |
1 files changed, 8 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 b4f72a48bc..bffb28d16e 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 @@ -9,7 +9,7 @@ width="800"> <string name="control_background_image_name">Inspector_Background</string> <string name="skip_step">0.2</string> - <string name="min_width">400</string> + <string name="min_width">300</string> <string name="min_height">120</string> <string name="zoom_near_padding">1.0</string> <string name="zoom_medium_padding">1.25</string> @@ -190,7 +190,7 @@ layout="topleft" top="14" min_width="22" - width="22"> + width="24"> <button image_overlay="Play_Off" image_disabled="PushButton_Disabled" @@ -200,6 +200,8 @@ hover_glow_amount="0.15" layout="topleft" tool_tip = "Play media" + left_delta="2" + top="4" height="22" min_width="22" width="22"> @@ -214,7 +216,7 @@ layout="topleft" top="18" min_width="22" - width="22"> + width="24"> <button image_overlay="Pause_Off" image_disabled="PushButton_Disabled" @@ -224,6 +226,9 @@ hover_glow_amount="0.15" layout="topleft" height="22" + width="22" + left_delta="-1" + top="4" tool_tip = "Pause media"> <button.commit_callback function="MediaCtrl.Pause" /> |