From 92ac9932878b4cd0b0369746482c6e1f47d76994 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 4 Feb 2010 22:19:15 -0800 Subject: Fix placement of icon next to linked agent/group names. Suppresses rendering of text in LLNormalTextSegment that represent an icon, properly computes vertical spacing based on font height, and adds padding to the right of the icon. (transplanted from 33be702e47c359ccaeb47f251e10753fd173cc09) --- indra/newview/skins/default/xui/en/floater_test_inspectors.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index 0f5c5f2be0..209285da2e 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -116,10 +116,10 @@ follows="left|top" font="SansSerif" height="20" - left="0" + left="10" max_length="65536" name="slurl" - top_pad="4" + top_pad="20" width="150"> secondlife:///app/agent/00000000-0000-0000-0000-000000000000/inspect @@ -127,12 +127,11 @@ follows="left|top" font="SansSerif" height="20" - left="0" + left="10" max_length="65536" name="slurl_group" - top_pad="4" + top_pad="20" width="150"> secondlife:///app/group/00000000-0000-0000-0000-000000000000/inspect - -- cgit v1.2.3 From d82be9cfefcde21cfd8d29c2989f66d792501e54 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Mon, 8 Feb 2010 15:09:50 +0200 Subject: Update for critical bug EXT-4838 ([NUX] Add empty Groups list condition text) - changed text of the message to "Try searching for some groups to join." --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_people.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 447ac1b123..31ea54cf40 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -237,7 +237,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t left="0" name="group_list" no_filtered_groups_msg="No groups" - no_groups_msg="[secondlife:///app/search/groups Trying searching for some groups to join.]" + no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" width="313" /> Date: Mon, 8 Feb 2010 15:53:56 +0200 Subject: Implemented critical task (EXT-4710) Update maturity icons for World Map. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/floater_world_map.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 34d4b19410..86ac7c8e54 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -279,12 +279,12 @@ + width="18" /> + width="18" /> + width="18" /> Date: Mon, 8 Feb 2010 16:40:06 +0200 Subject: Fixed normal bug (EXT-4212) There's an ability to send non-latin group notices but they turn to '????...' in group profile page. - Disabled non-ascii input in text editor. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_group_notices.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 5f46ad7860..1f16aea2ef 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -159,6 +159,7 @@ Maximum 200 per group daily left_pad="3" max_length="511" name="create_message" + text_type="ascii" top_delta="0" width="220" word_wrap="true" /> -- cgit v1.2.3 From 8903719a7bdf07960ed38137e5d5a4f7fe169821 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Mon, 8 Feb 2010 16:40:24 +0200 Subject: Fixed normal bug (EXT-3044) Non-latin chars became invisible in LM description after saving. - Disabled non-ascii input in text editor. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_landmark_info.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml index d1b22a34bb..6927906d3d 100644 --- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml +++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml @@ -269,6 +269,7 @@ name="notes_editor" read_only="true" text_readonly_color="white" + text_type="ascii" top_pad="5" width="290" wrap="true" /> -- cgit v1.2.3 From 7199c9cc1bbd17eecea33b77a97a5ad7b20d2888 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Mon, 8 Feb 2010 18:05:48 +0200 Subject: EXT-3232 Refactoring: Improved the way of horizontal alignment of button's image overlay. Now mLeftHPad/mRightHPad is used instead of mImageOverlayLeftPad and mImageOverlayRightPad. Also mImgOverlayLabelSpace/imgoverlay_label_space members was added to button.(h/xml) to define space between image overlay and button's label --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/widgets/button.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 74d8478551..5c80fb50af 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -11,6 +11,7 @@ image_right_pad="0" image_top_pad="0" image_bottom_pad="0" + imgoverlay_label_space="1" label_color="ButtonLabelColor" label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" -- cgit v1.2.3 From d2d6af3dfa0f8a423016f5972d44a9721b1be1ee Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Mon, 8 Feb 2010 18:06:41 +0200 Subject: Fixed critical bug EXT-4970 - Inventory offers by scripted objects are discarded when offered objects got the same name. Had to do minor refactoring of LLScripFloaterManager in order to fix this issue. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_active_object_row.xml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml index 7657fb8055..bef5f8dafd 100644 --- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml +++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml @@ -10,10 +10,6 @@ background_opaque="false" background_visible="true" bg_alpha_color="0.0 0.0 0.0 0.0" > - - Unknown Object - Date: Mon, 8 Feb 2010 18:32:53 +0200 Subject: Fixed major bug EXT-5022 (streaming media first use dialog should be removed) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/notifications.xml | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 72ac457882..90381c2af4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1731,21 +1731,6 @@ Multiple parcels selected. Try selecting a single parcel. - -This location can play streaming media. -Streaming media requires a fast Internet connection. - -Play streaming media when available? -(You can change this option later under Preferences > Privacy.) - - - Date: Mon, 8 Feb 2010 19:09:23 +0200 Subject: EXT - 3232 Refactoring: deleted unnecessary image_left_padding, image_right_padding members from button.h and button.xml and their the only place usage in LLTabContainer::reshapeTuple . Now image overlay placement adjustible via: mLeftHPad, mRightHPad, mImageOverlayBottomPad, mImageOverlayTopPad, mImgOverlayLabelSpace --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/widgets/button.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 5c80fb50af..1b34a731a5 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -7,8 +7,6 @@ image_selected="PushButton_Selected" image_disabled_selected="PushButton_Selected_Disabled" image_disabled="PushButton_Disabled" - image_left_pad="0" - image_right_pad="0" image_top_pad="0" image_bottom_pad="0" imgoverlay_label_space="1" -- cgit v1.2.3 From 6b92b866e49408622ed02b85a0518b01cdbcf7a9 Mon Sep 17 00:00:00 2001 From: Denis Serdjuk Date: Mon, 8 Feb 2010 20:01:52 +0200 Subject: fixed Bug EXT-3777 inspector tool tips and UI tool tips do not have round corners Tooltip handler has been added to inspector floater. Default background image of tooltip panel has been changed for inspector. --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/widgets/inspector.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 23f32253b6..428b2ce03b 100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -2,7 +2,7 @@ Date: Mon, 8 Feb 2010 11:15:25 -0800 Subject: DEV-43688 Cycle3 manual fix for missing tab_title= translation, JA DE --- indra/newview/skins/default/xui/de/panel_side_tray.xml | 14 +++++++------- indra/newview/skins/default/xui/ja/panel_side_tray.xml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml index 2cd11cdcef..446117962f 100644 --- a/indra/newview/skins/default/xui/de/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/de/panel_side_tray.xml @@ -2,26 +2,26 @@ - - + + - + - + - + - + - + diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml index ce5f0b940c..48636f1e3b 100644 --- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/ja/panel_side_tray.xml @@ -2,26 +2,26 @@ - - + + - + - + - + - + - + -- cgit v1.2.3 From b55dc023bf3cc2a6ac74851c4eb868e1b5a0ea19 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 8 Feb 2010 13:36:40 -0800 Subject: DEV-43688 Cycle3 Tim's resizing of FR GUI, and Noelle's translation of tab_title attributes --- .../newview/skins/default/xui/fr/floater_about.xml | 10 ++++--- .../skins/default/xui/fr/floater_about_land.xml | 32 ++++++++++++---------- .../skins/default/xui/fr/floater_avatar_picker.xml | 2 +- .../default/xui/fr/floater_avatar_textures.xml | 6 ++-- .../skins/default/xui/fr/floater_buy_currency.xml | 5 ++-- .../skins/default/xui/fr/floater_buy_land.xml | 21 ++++++++++---- .../skins/default/xui/fr/floater_color_picker.xml | 2 +- .../default/xui/fr/floater_day_cycle_options.xml | 16 +++++------ .../skins/default/xui/fr/floater_env_settings.xml | 6 ++-- .../skins/default/xui/fr/floater_god_tools.xml | 6 ++-- .../skins/default/xui/fr/floater_inspect.xml | 2 +- .../xui/fr/floater_inventory_item_properties.xml | 4 +-- .../xui/fr/floater_inventory_view_finder.xml | 2 +- .../skins/default/xui/fr/floater_joystick.xml | 28 +++++++++---------- .../default/xui/fr/floater_live_lsleditor.xml | 2 +- .../skins/default/xui/fr/floater_lsl_guide.xml | 9 +++--- .../skins/default/xui/fr/floater_media_browser.xml | 6 ++-- .../skins/default/xui/fr/floater_mem_leaking.xml | 6 ++-- .../skins/default/xui/fr/floater_notification.xml | 2 +- .../skins/default/xui/fr/floater_pay_object.xml | 8 +++--- .../skins/default/xui/fr/floater_perm_prefs.xml | 2 +- .../skins/default/xui/fr/floater_postcard.xml | 8 +++--- .../xui/fr/floater_preview_gesture_shortcut.xml | 4 +-- .../skins/default/xui/fr/floater_report_abuse.xml | 6 ++-- .../skins/default/xui/fr/floater_sell_land.xml | 4 +-- .../default/xui/fr/floater_settings_debug.xml | 2 +- .../skins/default/xui/fr/floater_snapshot.xml | 4 +-- .../skins/default/xui/fr/floater_telehub.xml | 5 ++-- .../skins/default/xui/fr/floater_url_entry.xml | 8 +++--- .../newview/skins/default/xui/fr/floater_water.xml | 5 ++-- .../default/xui/fr/floater_windlight_options.xml | 2 +- .../skins/default/xui/fr/inspect_remote_object.xml | 2 +- .../skins/default/xui/fr/panel_audio_device.xml | 2 +- .../skins/default/xui/fr/panel_edit_alpha.xml | 2 +- .../skins/default/xui/fr/panel_edit_gloves.xml | 2 +- .../skins/default/xui/fr/panel_edit_jacket.xml | 2 +- .../skins/default/xui/fr/panel_edit_pants.xml | 2 +- .../skins/default/xui/fr/panel_edit_profile.xml | 2 +- .../skins/default/xui/fr/panel_edit_shirt.xml | 2 +- .../skins/default/xui/fr/panel_edit_shoes.xml | 2 +- .../skins/default/xui/fr/panel_edit_skin.xml | 4 +-- .../skins/default/xui/fr/panel_edit_skirt.xml | 2 +- .../skins/default/xui/fr/panel_edit_socks.xml | 2 +- .../skins/default/xui/fr/panel_edit_tattoo.xml | 6 ++-- .../skins/default/xui/fr/panel_edit_underpants.xml | 2 +- .../skins/default/xui/fr/panel_edit_undershirt.xml | 2 +- .../skins/default/xui/fr/panel_edit_wearable.xml | 2 +- .../default/xui/fr/panel_group_info_sidetray.xml | 2 +- .../default/xui/fr/panel_group_land_money.xml | 14 +++++----- .../skins/default/xui/fr/panel_group_notices.xml | 16 +++++------ .../skins/default/xui/fr/panel_group_roles.xml | 12 ++++---- .../newview/skins/default/xui/fr/panel_groups.xml | 4 +-- indra/newview/skins/default/xui/fr/panel_login.xml | 2 +- .../xui/fr/panel_media_settings_security.xml | 3 +- .../skins/default/xui/fr/panel_nearby_chat.xml | 6 ++-- indra/newview/skins/default/xui/fr/panel_notes.xml | 4 +-- .../default/xui/fr/panel_preferences_advanced.xml | 2 +- .../default/xui/fr/panel_preferences_graphics1.xml | 4 +-- .../default/xui/fr/panel_preferences_setup.xml | 2 +- .../newview/skins/default/xui/fr/panel_profile.xml | 4 +-- .../skins/default/xui/fr/panel_region_covenant.xml | 6 ++-- .../skins/default/xui/fr/panel_region_debug.xml | 2 +- .../skins/default/xui/fr/panel_region_estate.xml | 6 ++-- .../skins/default/xui/fr/panel_region_general.xml | 4 +-- .../default/xui/fr/panel_region_general_layout.xml | 10 +++---- .../skins/default/xui/fr/panel_region_texture.xml | 2 +- .../xui/fr/panel_script_limits_my_avatar.xml | 2 +- .../xui/fr/panel_script_limits_region_memory.xml | 4 +-- .../skins/default/xui/fr/panel_side_tray.xml | 14 +++++----- indra/newview/skins/default/xui/fr/strings.xml | 4 +-- 70 files changed, 205 insertions(+), 187 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml index 7d6d736c5e..440412c0c0 100644 --- a/indra/newview/skins/default/xui/fr/floater_about.xml +++ b/indra/newview/skins/default/xui/fr/floater_about.xml @@ -49,19 +49,20 @@ Version Vivox : [VIVOX_VERSION] - Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant +Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion + 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion APR Copyright (C) 2000-2004 The Apache Software Foundation cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). GL Copyright (C) 1999-2004 Brian Paul. Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. - jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) + jpeg2000 Copyright (C) 2001, David Taubman, The University of New South + Wales (UNSW) jpeglib Copyright (C) 1991-1998, Thomas G. Lane. ogg/vorbis Copyright (C) 2001, Xiphophorus OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. @@ -73,7 +74,8 @@ Version Vivox : [VIVOX_VERSION] Tous droits réservés. Voir licenses.txt pour plus de détails. - Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C) + Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 + Annex C) diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index 4c97551e55..8e2b27aca6 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -12,7 +12,7 @@ restantes - + Nouveaux utilisateurs uniquement @@ -128,10 +128,10 @@ 0 -