diff options
21 files changed, 83 insertions, 79 deletions
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml index 49e1397e9f..c756bc6969 100644 --- a/indra/newview/skins/default/xui/da/floater_joystick.xml +++ b/indra/newview/skins/default/xui/da/floater_joystick.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Joystick" title="JOYSTICK OPSÆTNING"> <check_box label="Aktiver Joystick:" name="enable_joystick"/> - <spinner label="X akse mapping" name="JoystickAxis1"/> - <spinner label="Y akse mapping" name="JoystickAxis2"/> - <spinner label="Z akse mapping" name="JoystickAxis0"/> - <spinner label="Hældning mapping" name="JoystickAxis4"/> - <spinner label="Drejning mapping" name="JoystickAxis5"/> - <spinner label="Rulning mapping" name="JoystickAxis3"/> - <spinner label="Zoom mapping" name="JoystickAxis6"/> + <spinner label="X akse mapping" name="JoystickAxis1" label_width="115" width="155"/> + <spinner label="Y akse mapping" name="JoystickAxis2" label_width="115" width="155"/> + <spinner label="Z akse mapping" name="JoystickAxis0" label_width="115" width="155"/> + <spinner label="Hældning mapping" name="JoystickAxis4" label_width="115" width="155"/> + <spinner label="Drejning mapping" name="JoystickAxis5" label_width="115" width="155"/> + <spinner label="Rulning mapping" name="JoystickAxis3" label_width="115" width="155"/> + <spinner label="Zoom mapping" name="JoystickAxis6" label_width="115" width="155"/> <check_box label="Direkte zoom" name="ZoomDirect"/> <check_box label="3D Cursor" name="Cursor3D"/> <check_box label="Auto opret" name="AutoLeveling"/> diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml index 443e84b64a..e05be4e310 100644 --- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml @@ -3,7 +3,7 @@ <text name="media_label"> Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner </text> - <line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)"/> + <line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)" bottom_delta="25"/> <button label="OK" name="ok_btn"/> <button label="Annullér" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml index 7caa17d514..fa245416cf 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml @@ -4,6 +4,7 @@ Vis mig når: </text> <check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/> + <check_box name="notify_money_spend_checkbox" left_delta="70"/> <check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/> <text name="show_label"> Vis altid: diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml index 26d2ae4abd..acae39061b 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml @@ -30,7 +30,7 @@ <radio_item label="Avatar position" name="1"/> </radio_group> <check_box label="Bevæg avatar-læber når der snakkes" name="enable_lip_sync"/> - <check_box label="Skift tale tænd/sluk når jeg trykker:" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/> + <check_box label="Skift tale tænd/sluk når jeg trykker" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/> <line_editor label="Tryk-for-tale udløser" name="modifier_combo"/> <button label="Angiv taste" name="set_voice_hotkey_button"/> <button name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste muse-knap"/> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 347b523a6b..ffb9c0f78e 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1593,7 +1593,7 @@ Only large parcels can be listed in search. left="10" name="with media:" top="10" - width="100"> + width="110"> Type: </text> <combo_box @@ -1620,7 +1620,7 @@ Only large parcels can be listed in search. layout="topleft" left="10" name="at URL:" - width="100" + width="110" top_pad="10"> Home Page: </text> @@ -1632,7 +1632,7 @@ Only large parcels can be listed in search. max_length_bytes="255" name="media_url" select_on_focus="true" - width="300" + width="290" top_delta="0"/> <button follows="left|top" @@ -1659,13 +1659,13 @@ Only large parcels can be listed in search. follows="left|top" height="20" layout="topleft" - left="110" + left="120" max_length_bytes="255" name="url_description" select_on_focus="true" tool_tip="Text displayed next to play/load button" top_delta="0" - width="300" /> + width="290" /> <text type="string" length="1" @@ -1685,7 +1685,7 @@ Only large parcels can be listed in search. follows="left|top" height="80" layout="topleft" - left="110" + left="120" name="media texture" tool_tip="Click to choose a picture" top_delta="0" @@ -1698,7 +1698,7 @@ Only large parcels can be listed in search. layout="topleft" left_pad="8" name="replace_texture_help" - width="300" + width="290" word_wrap="true" top_delta="0"> Objects using this texture will show the movie or web page after you click the play arrow. Select the thumbnail to choose a different texture. @@ -1707,7 +1707,7 @@ Only large parcels can be listed in search. height="16" label="Auto scale" layout="topleft" - left="107" + left="117" name="media_auto_scale" top_pad="-10" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required." @@ -1721,7 +1721,7 @@ Only large parcels can be listed in search. left="10" name="media_size" tool_tip="Size to render Web media, leave 0 for default." - width="100" + width="110" top_pad="10"> Size: </text> @@ -1776,7 +1776,7 @@ Only large parcels can be listed in search. left="10" name="Options:" top_pad="10" - width="100"> + width="110"> Options: </text> <check_box @@ -1786,7 +1786,7 @@ Only large parcels can be listed in search. left_pad="-3" name="media_loop" tool_tip="Play media in a loop. When the media has finished playing, it will restart from the beginning." - top_delta="-1" + top_delta="1" width="200" /> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml index 870ddee554..8538c255bf 100644 --- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml +++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml @@ -59,6 +59,7 @@ image_hover_unselected="PushButton_Login_Over" label_color="White" top_pad ="15" + pad_bottom="1" width="140"/> <button follows="top|left|right" @@ -66,6 +67,7 @@ label="Later" layout="topleft" left_pad="9" + pad_bottom="1" name="close_btn" width="90"/> <icon diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml index 889eeb5369..d6dc112dce 100644 --- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -47,15 +47,15 @@ name="ambient_lbl" height="10" layout="topleft" - left="10" + left="7" top="5" - width="80">Ambient:</text> + width="80">Ambient</text> <color_swatch can_apply_immediately="true" follows="left|top" height="40" label_height="0" layout="topleft" - left_delta="0" + left_delta="3" name="ambient_light" top_pad="5" width="60"/> @@ -63,15 +63,15 @@ name="blue_horizon_lbl" height="10" layout="topleft" - left_delta="0" + left="7" top_pad="10" - width="80">Blue Horizon:</text> + width="80">Blue Horizon</text> <color_swatch can_apply_immediately="true" follows="left|top" height="40" label_height="0" layout="topleft" - left_delta="0" + left_delta="3" name="blue_horizon" top_pad="5" width="60"/> @@ -79,15 +79,15 @@ name="blue_density_lbl" height="10" layout="topleft" - left_delta="0" + left="7" top_pad="10" - width="80">Blue Density:</text> + width="80">Blue Density</text> <color_swatch can_apply_immediately="true" follows="left|top" height="40" label_height="0" layout="topleft" - left_delta="0" + left_delta="3" name="blue_density" top_pad="5" width="60"/> @@ -107,7 +107,7 @@ layout="topleft" right="-12" top="5" - width="60">Sun Color:</text> + width="60">Sun Color</text> <color_swatch can_apply_immediately="true" follows="left|top" height="10" @@ -123,7 +123,7 @@ layout="topleft" left_delta="0" top_pad="5" - width="80">Cloud Color:</text> + width="80">Cloud Color</text> <color_swatch can_apply_immediately="true" follows="left|top" height="10" @@ -139,7 +139,7 @@ left_delta="0" top_pad="10" name="cloud_map_label" - width="80">Cloud Image:</text> + width="80">Cloud Image</text> <texture_picker height="63" layout="topleft" left_delta="0" @@ -152,7 +152,7 @@ left_delta="0" top_pad="-13" name="water_map_label" - width="80">Water Image:</text> + width="80">Water Image</text> <texture_picker height="63" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 787b2f8be4..b911e9b6f5 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -290,7 +290,7 @@ <button follows="top|left" height="23" - width="110" + width="113" label="Clone Track From" left="10" top_pad="10" @@ -298,7 +298,7 @@ <button follows="top|left" height="23" - width="110" + width="113" label="Load Track From" top_pad="0" left_delta="0" @@ -306,7 +306,7 @@ <button follows="top|left" height="23" - width="110" + width="113" label="Clear Track" top_pad="0" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index 7097689118..e94669bba4 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -526,7 +526,7 @@ height="16" label="Disable Physics" layout="topleft" - left_delta="120" + left_delta="136" name="disable physics" tool_tip="Set this to disable all physics in this region" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index a023f2064f..fb828b804a 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1407,7 +1407,7 @@ follows="top|left" height="15" layout="topleft" - left="220" + left="240" name="pelvis_offset_label" text_color="White" top="8" @@ -1421,12 +1421,13 @@ max_val="3.0" name="pelvis_offset" top_pad="10" + left="340" value="0.0" width="80"/> <text follows="top|left" height="17" - left="425" + left="435" name="skin_too_many_joints" text_color="Orange" top="7" @@ -1437,7 +1438,7 @@ <text follows="top|left" height="32" - left="425" + left="435" name="skin_unknown_joint" text_color="Orange" top="8" diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 2a18134491..99dca7b395 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -664,7 +664,7 @@ increment="8" initial_value="160" label="Sky:" - label_width="145" + label_width="164" layout="topleft" left="420" min_val="16" @@ -750,7 +750,7 @@ control_name="RenderShadowDetail" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="ShadowDetail" width="150"> @@ -800,7 +800,7 @@ control_name="RenderReflectionProbeDetail" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="ReflectionDetail" width="150"> @@ -836,7 +836,7 @@ control_name="RenderReflectionProbeLevel" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="ReflectionLevel" width="150"> @@ -868,7 +868,7 @@ name="ReflectionProbeCount" text_readonly_color="LabelDisabledColor" top_delta="22" - width="128"> + width="130"> Max Reflection Probes: </text> @@ -877,7 +877,7 @@ height="18" layout="topleft" label="Max. Reflection Probes:" - left_delta="130" + left_delta="175" top_delta="0" name="ProbeCount" width="150"> @@ -911,7 +911,7 @@ increment="0.1" initial_value="160" label="Exposure:" - label_width="145" + label_width="164" layout="topleft" left="420" min_val="0.5" @@ -955,7 +955,7 @@ control_name="RenderHeroProbeResolution" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="MirrorResolution" width="150"> @@ -995,7 +995,7 @@ control_name="RenderHeroProbeUpdateRate" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="HeroProbeUpdateRate" width="150"> @@ -1026,7 +1026,7 @@ increment="0.1" initial_value="160" label="Sharpening:" - label_width="145" + label_width="164" layout="topleft" left="420" min_val="0.0" @@ -1055,7 +1055,7 @@ control_name="RenderTonemapType" height="18" layout="topleft" - left_delta="130" + left_delta="175" top_delta="0" name="TonemapType" width="150"> @@ -1077,7 +1077,7 @@ initial_value="1" label="Tone Mapping Mix:" tool_tip="Mix between linear and tone mapped colors" - label_width="145" + label_width="164" layout="topleft" left="420" min_val="0.0" diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index 64c97b1a11..718569bf34 100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -49,7 +49,7 @@ button_display_mode="icons_with_text" follows="all" left="20" - button_icon_and_text.button_width.max="145" + button_icon_and_text.button_width.max="172" button_icon_and_text.button_width.min="70" name="toybox_toolbar" pad_left="5" diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml index 4e75b2b29c..fdc1e64e05 100644 --- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml @@ -10,12 +10,12 @@ title="WHITELIST ENTRY" width="390"> - <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft" - left="10" name="media_label" top="20"> + <text type="string" length="1" follows="top|left|right" height="30" layout="topleft" + left="10" name="media_label" top="20" right="-10" word_wrap="true"> Enter a URL or URL pattern to add to the list of allowed domains </text> - <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif" + <line_editor bottom_delta="15" enabled="true" follows="left|top" font="SansSerif" height="20" left="10" name="whitelist_entry" tool_tip="Enter a URL or URL pattern to White List" width="350" /> diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 3c6e100541..6012be8bed 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -194,7 +194,7 @@ /> <font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" - size="10" + size="9" /> <font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml index 1e4925a141..697c6e60b7 100644 --- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml +++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml @@ -252,7 +252,7 @@ layout="topleft" left_delta="0" top_pad="5" - width="102" + width="105" name="roughness_factor_lbl"> Roughness Factor </text> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 77fcb25692..482cbef236 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -271,7 +271,7 @@ <combo_box.drop_down_button pad_bottom="1" pad_left="10" - font="SansSerif" + font="SansSerifLarge" label_color="Black" label_color_selected="Black" draw_focus_border="false" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index ac90d80bbf..704cf549cd 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -21,7 +21,7 @@ increment="64" initial_value="1024" label="Cache size (896 - 32768MB)" - label_width="161" + label_width="165" layout="topleft" left="33" max_val="32768" @@ -47,7 +47,7 @@ label="Clear Cache" label_selected="Clear Cache" layout="topleft" - left_pad="20" + left_pad="25" name="clear_cache" top_delta="0" width="100"> 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 36c3b2dedd..1dcbf4e666 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -327,7 +327,7 @@ control_name="MediaSoundsEarLocation" follows="left|top" layout="topleft" - left_pad="5" + left_pad="10" width="130" height="23" top_delta="-4" @@ -357,7 +357,7 @@ follows="left|top" layout="topleft" height="23" - left_delta="185" + left_delta="190" top_delta="-4" name="media_auto_play_combo" width="130"> @@ -390,7 +390,7 @@ follows="left|top" layout="topleft" height="23" - left_delta="185" + left_delta="190" top_delta="-4" width="130" name="media_first_interact_combo" @@ -458,7 +458,7 @@ layout="topleft" follows="left" height="15" - width="180" + width="187" name="noise_suppression_label" left="23" top_delta="22" @@ -470,7 +470,7 @@ enabled_control="EnableVoiceChat" follows="left|top" layout="topleft" - left_delta="185" + left_delta="190" top_delta="-6" width="130" height="23" @@ -514,7 +514,7 @@ control_name="VoiceEarLocation" follows="left|top" layout="topleft" - left_delta="185" + left_delta="190" top_delta="-6" width="130" height="23" @@ -546,7 +546,7 @@ tool_tip="Check to enable voice echo cancellation" label="Echo Cancellation" layout="topleft" - left="270" + left="275" name="enable_echo_cancellation" top_pad="-15" width="200"/> @@ -570,7 +570,7 @@ label="Automatic Gain Control" layout="topleft" name="voice_automatic_gain_control" - left="270" + left="275" top_pad="-15" width="200"/> <check_box @@ -592,7 +592,7 @@ label="Show voice dot above avatars" layout="topleft" name="voice_dot_visualizer" - left="270" + left="275" top_pad="-15" width="200"/> <button diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index bc5a64a209..c03d6a9745 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -35,7 +35,7 @@ layout="topleft" left_delta="15" top_pad="15" - width="80"> + width="86"> Ambient Color: </text> <color_swatch @@ -53,9 +53,9 @@ follows="left" height="10" layout="topleft" - left_delta="90" + left_delta="110" top_delta="-15" - width="80"> + width="86"> Blue Horizon: </text> <color_swatch @@ -73,9 +73,9 @@ follows="left" height="10" layout="topleft" - left_delta="90" + left_delta="110" top_delta="-15" - width="80"> + width="86"> Blue Density: </text> <color_swatch diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 759f049a7a..a038fe5181 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -21,7 +21,7 @@ image_disabled_selected="PushButton_Selected_Disabled" image_disabled="PushButton_Disabled" button_width.min="70" - button_width.max="145" + button_width.max="172" desired_height="24" pad_left="10" pad_right="10" diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml index 64be14a69c..a0b119ed72 100644 --- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <inventory_list_item follows="top|right|left" - height="20" + height="21" name="inventory_item" tab_stop="false" hover_image="ListItem_Over" @@ -25,7 +25,7 @@ layout="topleft" left="0" name="item_icon" - top="0" + top="1" width="16" /> <item_name follows="left|right" @@ -36,7 +36,7 @@ use_ellipses="true" name="item_name" text_color="white" - top="1" + top="2" value="..." width="359" /> <add_btn |