diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:50:07 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:50:07 -0500 |
commit | bf5e9b8374c905b795339ca6426034e237ed5378 (patch) | |
tree | bdfdc49d4edf9d2bce169c76d29e55c2ed6b9184 /indra/newview/skins/default/xui/en | |
parent | c68d6c794c8f6654ad83bf56977886c8d30c599f (diff) | |
parent | 025db4bab7cc5bb62b82b12a4bde364133fa6c7e (diff) |
merge fix for STORM-584
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 16 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 55 |
2 files changed, 36 insertions, 35 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index f361cb7f8e..e70e1eb61b 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -160,7 +160,7 @@ layout="topleft" left="10" height="70" - top="54" + top="59" name="focus_radio_group"> <radio_item top_pad="6" @@ -197,7 +197,7 @@ <radio_group left="10" height="70" - top="54" + top="59" layout="topleft" name="move_radio_group"> <radio_item @@ -931,7 +931,7 @@ height="23" image_overlay="Edit_Wrench" layout="topleft" - left_pad="3" + left_pad="13" name="button set group" tab_stop="false" tool_tip="Choose a group to share this object's permissions" @@ -944,7 +944,7 @@ name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions." top_pad="10" - left="106" + left="100" width="87" /> <button follows="top|left" @@ -953,7 +953,7 @@ label_selected="Deed" layout="topleft" name="button deed" - left_pad="3" + left_pad="19" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer." width="80" /> <text @@ -974,7 +974,7 @@ layout="topleft" name="clickaction" width="148" - left_pad="0"> + left_pad="10"> <combo_box.item label="Touch (default)" name="Touch/grab(default)" @@ -1009,7 +1009,7 @@ width="100" /> <!-- NEW SALE TYPE COMBO BOX --> <combo_box - left_pad="0" + left_pad="10" layout="topleft" follows="left|top" allow_text_entry="false" @@ -1041,7 +1041,7 @@ even though the user gets a free copy. decimal_digits="0" increment="1" top_pad="8" - left="108" + left="118" control_name="Edit Cost" name="Edit Cost" label="Price: L$" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 8ade41f587..da366f30ae 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -70,7 +70,7 @@ name="UI Volume" show_text="false" slider_label.halign="right" - top_pad="5" + top_pad="4" volume="true" width="300"> <slider.commit_callback @@ -104,7 +104,7 @@ name="Wind Volume" show_text="false" slider_label.halign="right" - top_pad="5" + top_pad="4" volume="true" width="300"> <slider.commit_callback @@ -138,7 +138,7 @@ left="0" name="SFX Volume" show_text="false" - top_pad="7" + top_pad="4" volume="true" width="300"> <slider.commit_callback @@ -172,7 +172,7 @@ name="Music Volume" slider_label.halign="right" show_text="false" - top_pad="5" + top_pad="4" volume="true" width="300"> <slider.commit_callback @@ -215,7 +215,7 @@ name="Media Volume" show_text="false" slider_label.halign="right" - top_pad="5" + top_pad="4" volume="true" width="300"> <slider.commit_callback @@ -257,7 +257,7 @@ label_width="120" layout="topleft" left="0" - top_pad="5" + top_pad="4" name="Voice Volume" show_text="false" slider_label.halign="right" @@ -301,9 +301,9 @@ height="15" tool_tip="Check this to let media auto-play if it wants" label="Allow Media to auto-play" - top_pad="5" + top_pad="1" left="25"/> - <check_box + <check_box name="media_show_on_others_btn" control_name="MediaShowOnOthers" value="true" @@ -313,16 +313,6 @@ label="Play media attached to other avatars" left="25" width="230"/> - <check_box - control_name="LipSyncEnabled" - follows="left|top" - height="20" - label="Move avatar lips when speaking" - layout="topleft" - left_pad="0" - name="enable_lip_sync" - width="237" - top_delta="-4" /> <text type="string" @@ -333,7 +323,7 @@ left="25" name="voice_chat_settings" width="180" - top_pad="10"> + top_pad="7"> Voice Chat Settings </text> <text @@ -341,10 +331,10 @@ length="1" follows="left|top" layout="topleft" - left="80" + left="46" top_delta="16" name="Listen from" - width="102"> + width="112"> Listen from: </text> <icon @@ -363,7 +353,7 @@ height="18" image_name="Move_Walk_Off" layout="topleft" - left_pad="130" + left_pad="170" name="avatar_icon" mouse_opaque="false" visible="true" @@ -375,7 +365,7 @@ draw_border="false" follows="left|top" layout="topleft" - left_delta="-128" + left_delta="-168" width="221" height="20" name="ear_location"> @@ -391,11 +381,21 @@ follows="left|top" label="Avatar position" layout="topleft" - left_pad="-54" + left_pad="-16" name="1" top_delta ="0" width="200" /> </radio_group> + <check_box + control_name="LipSyncEnabled" + follows="left|top" + height="15" + label="Move avatar lips when speaking" + layout="topleft" + left="44" + name="enable_lip_sync" + top_pad="5" + width="237"/> <check_box follows="top|left" enabled_control="EnableVoiceChat" @@ -403,10 +403,11 @@ height="15" label="Toggle speak on/off when I press:" layout="topleft" - left="30" + left="44" name="push_to_talk_toggle_check" width="237" - tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/> + tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down." + top_pad="3"/> <line_editor follows="top|left" control_name="PushToTalkButton" @@ -454,7 +455,7 @@ label="Input/Output devices" layout="topleft" left="20" - top_pad="8" + top_pad="6" name="device_settings_btn" width="190"> </button> |