From 9f6e47395cb1d82f72c106561be0088ac150d602 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Mon, 8 Mar 2010 10:54:59 -0800 Subject: linguistic fixes --- indra/newview/skins/default/xui/de/floater_customize.xml | 4 ++-- indra/newview/skins/default/xui/de/floater_texture_ctrl.xml | 2 +- indra/newview/skins/default/xui/de/panel_edit_jacket.xml | 4 ++-- indra/newview/skins/default/xui/es/notifications.xml | 2 +- indra/newview/skins/default/xui/es/panel_login.xml | 2 +- indra/newview/skins/default/xui/es/panel_preferences_general.xml | 4 ++-- indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml | 6 +++--- indra/newview/skins/default/xui/ja/floater_world_map.xml | 4 ++-- indra/newview/skins/default/xui/ja/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/ja/strings.xml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/indra/newview/skins/default/xui/de/floater_customize.xml b/indra/newview/skins/default/xui/de/floater_customize.xml index f45ae53e99..f284d7cd6b 100644 --- a/indra/newview/skins/default/xui/de/floater_customize.xml +++ b/indra/newview/skins/default/xui/de/floater_customize.xml @@ -311,8 +311,8 @@ Jacke: - - + + -- cgit v1.2.3 From d9c64d221353cf4bfc1fffa69f3fc083e76f3b4c Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 17 Mar 2010 18:19:31 -0700 Subject: fix for radio item not being selected after picking internal browser reviewed by Callum --- indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a2b15a2b87..15f8b33f5b 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -273,7 +273,7 @@ layout="topleft" left="0" name="internal" - value="0" + value="" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." top="0" width="480" /> @@ -283,7 +283,7 @@ layout="topleft" left_delta="0" name="external" - value="1" + value="true" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." top_delta="20" width="480" /> -- cgit v1.2.3 From a3a4235a8904cf4d6e565c82d5d90d8a64c15180 Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Thu, 18 Mar 2010 09:22:34 -0400 Subject: EXT-6321 -- clicking on an event in the main map now invokes the event details floater instead of trying to do a search for the event. --- indra/newview/llworldmapview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 5edf72d4ae..27757d19e5 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -45,6 +45,7 @@ #include "llagent.h" #include "llcallingcard.h" +#include "llcommandhandler.h" #include "llviewercontrol.h" #include "llfloatermap.h" #include "llfloaterworldmap.h" @@ -1726,7 +1727,10 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask ) id.toString(uuid_str); uuid_str = uuid_str.substr(28); sscanf(uuid_str.c_str(), "%X", &event_id); - LLFloaterReg::showInstance("search", LLSD().with("category", "events").with("id", event_id)); + // Invoke the event details floater if someone is clicking on an event. + LLSD params(LLSD::emptyArray()); + params.append(event_id); + LLCommandDispatcher::dispatch("event", params, LLSD(), NULL, true); break; } case MAP_ITEM_LAND_FOR_SALE: -- cgit v1.2.3 From d856f1ea9516f6d852dca56f16e08266747e3e96 Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Thu, 18 Mar 2010 15:44:31 +0200 Subject: =?UTF-8?q?Low=20task=20(EXT-6261)=20[HARD=20CODED]=20Abuse=20Repo?= =?UTF-8?q?rt:=20After=20sending=20an=20abuse=20report,=20there=20is=20a?= =?UTF-8?q?=20popup=20window=20stating=20that=20the=20report=20is=20sent/u?= =?UTF-8?q?ploaded.=20The=20window=20isn=C2=B4t=20localized.=20-=20Removed?= =?UTF-8?q?=20hardcoded=20string.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/ --HG-- branch : product-engine --- indra/newview/llfloaterreporter.cpp | 5 +++-- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 0f3c176cea..42a7eeff26 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -84,6 +84,8 @@ #include "llassetuploadresponders.h" #include "llagentui.h" +#include "lltrans.h" + const U32 INCLUDE_SCREENSHOT = 0x01 << 0; //----------------------------------------------------------------------------- @@ -372,8 +374,7 @@ void LLFloaterReporter::onClickSend(void *userdata) return; } - - LLUploadDialog::modalUploadDialog("Uploading...\n\nReport"); + LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report")); // *TODO don't upload image if checkbox isn't checked std::string url = gAgent.getRegion()->getCapability("SendUserReport"); std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot"); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c6d9e79267..d24873e9e6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3070,4 +3070,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Officers Owners + Uploading... + +Abuse Report -- cgit v1.2.3 From bca2d21df6cc504bb090a81f231c90a8c544e063 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Thu, 18 Mar 2010 16:10:16 +0200 Subject: Updates for normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, profiles: the teleport button is truncated. need 'en' xui designer rework) * 'en/panel_profile.xml' was redesigned. Assuming that 'de' locale doesn't have width overridden: ** added ellipses to buttons' labels to get possibility found truncation easier (except for IM button) ** reduced distance between buttons ** reduced padding from left/right sides to 1 px But there are still issue in two locales: 'es' for "add friend" 'pt' for "teleport" These buttons can not be shown properly with default widths. Note: 'de' & 'fr' locales have overridden width (not removed in the patch) --HG-- branch : product-engine --- .../newview/skins/default/xui/en/panel_profile.xml | 33 ++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 412485e03f..9fcabc7722 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -311,12 +311,15 @@ height="23" label="Add Friend" layout="topleft" - left="2" + left="1" mouse_opaque="false" name="add_friend" + pad_left="1" + pad_right="1" tool_tip="Offer friendship to the Resident" top="5" - width="80" /> + use_ellipses="true" + width="105" /> Date: Fri, 19 Mar 2010 12:09:06 -0500 Subject: EXT-6421 [crashhunters] Crash in LLViewerObject::getBoundingBoxAgent() added null guard to fix crash when the xform has no parent. reviewed by davep. --- indra/newview/llviewerobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5642d07a5..6c8346df86 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4029,7 +4029,8 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const avatar_parent = (LLViewerObject*)root_edit->getParent(); } - if (avatar_parent && avatar_parent->isAvatar() && root_edit && root_edit->mDrawable.notNull()) + if (avatar_parent && avatar_parent->isAvatar() && + root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent()) { LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent(); position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition(); -- cgit v1.2.3 From b952a5e5851d1a8bc2a45f00248b051497fec71f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 19 Mar 2010 13:21:39 -0400 Subject: EXT-6479 : Inspect Object floater doesn't update highlight and selection EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Simple fix to only use Inspect floater if it's actually active (i.e. visible). --- indra/newview/llselectmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c4ca4a65f8..9147bd1cba 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -4937,7 +4937,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) { LLUUID inspect_item_id= LLUUID::null; LLFloaterInspect* inspect_instance = LLFloaterReg::getTypedInstance("inspect"); - if(inspect_instance) + if(inspect_instance && inspect_instance->getVisible()) { inspect_item_id = inspect_instance->getSelectedUUID(); } -- cgit v1.2.3 From 107e076c83caf1d0163f5a0a3c0d3ee0b8ed1e56 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Fri, 19 Mar 2010 17:40:39 +0000 Subject: EXT-6486 Update Vivox SDK to 3.1.0001.8181 New Vivox SDK release to fix three main crash issues discovered through automatic crash reporting to Vivox enabled in Beta 4, along with extra diagnostics to help track down the cause of SLVoice failing to exit. --- install.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install.xml b/install.xml index 7337241cf8..51aa199282 100644 --- a/install.xml +++ b/install.xml @@ -1386,23 +1386,23 @@ anguage Infrstructure (CLI) international standard darwin md5sum - bce6f58d3d63bda049bb7059583ed8e8 + 38d836fa53d073b9f197eecd0f5615f0 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-darwin-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-darwin-20100319.tar.bz2 linux md5sum - 12aac7288af3565ac2730796cb6d8de6 + dd8dd1c223ecb8b232bf626cca6c63ac url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-linux-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-linux-20100319.tar.bz2 windows md5sum - 8af04ae8c536e8db80f67e6e5305fb61 + 8b4ce60f25823cd38896cb3b7eb0dd43 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8016-windows-20100225.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.1.0001.8181-windows-20100319.tar.bz2 -- cgit v1.2.3 From 8cd1f7d1e158632ef5d7f01b685105647e42b56f Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Fri, 19 Mar 2010 11:11:42 -0700 Subject: FR linguistic; CT-575 IT set7 translation for beta 5 --- .../default/xui/fr/floater_day_cycle_options.xml | 2 +- .../skins/default/xui/fr/mime_types_linux.xml | 2 +- .../skins/default/xui/fr/mime_types_mac.xml | 2 +- .../default/xui/fr/panel_prim_media_controls.xml | 2 +- .../newview/skins/default/xui/it/floater_about.xml | 16 +- .../skins/default/xui/it/floater_about_land.xml | 22 +- .../default/xui/it/floater_animation_preview.xml | 3 + .../default/xui/it/floater_avatar_textures.xml | 55 +-- .../skins/default/xui/it/floater_bulk_perms.xml | 2 +- .../skins/default/xui/it/floater_buy_currency.xml | 2 +- .../skins/default/xui/it/floater_buy_land.xml | 258 ++++++------- .../skins/default/xui/it/floater_color_picker.xml | 2 +- .../skins/default/xui/it/floater_customize.xml | 108 +++--- .../skins/default/xui/it/floater_help_browser.xml | 7 +- indra/newview/skins/default/xui/it/floater_im.xml | 2 +- .../skins/default/xui/it/floater_im_container.xml | 2 +- .../skins/default/xui/it/floater_incoming_call.xml | 6 + .../skins/default/xui/it/floater_inventory.xml | 8 +- .../default/xui/it/floater_live_lsleditor.xml | 2 +- .../skins/default/xui/it/floater_lsl_guide.xml | 2 +- indra/newview/skins/default/xui/it/floater_map.xml | 2 +- .../skins/default/xui/it/floater_media_browser.xml | 8 +- .../skins/default/xui/it/floater_moveview.xml | 4 +- .../skins/default/xui/it/floater_outgoing_call.xml | 12 + .../skins/default/xui/it/floater_pay_object.xml | 2 +- .../skins/default/xui/it/floater_preferences.xml | 2 +- .../default/xui/it/floater_preview_animation.xml | 2 +- .../default/xui/it/floater_preview_gesture.xml | 3 + .../default/xui/it/floater_preview_notecard.xml | 6 +- .../skins/default/xui/it/floater_preview_sound.xml | 2 +- .../default/xui/it/floater_preview_texture.xml | 7 +- .../skins/default/xui/it/floater_report_abuse.xml | 4 +- .../default/xui/it/floater_script_preview.xml | 2 +- .../skins/default/xui/it/floater_select_key.xml | 2 +- .../default/xui/it/floater_settings_debug.xml | 8 +- .../skins/default/xui/it/floater_snapshot.xml | 21 +- .../skins/default/xui/it/floater_sys_well.xml | 2 +- .../skins/default/xui/it/floater_texture_ctrl.xml | 2 +- .../skins/default/xui/it/floater_top_objects.xml | 69 ++-- .../default/xui/it/floater_voice_controls.xml | 17 +- .../default/xui/it/floater_wearable_save_as.xml | 2 +- .../default/xui/it/floater_whitelist_entry.xml | 2 +- .../skins/default/xui/it/floater_world_map.xml | 69 +--- .../skins/default/xui/it/inspect_avatar.xml | 2 +- .../skins/default/xui/it/menu_avatar_self.xml | 8 +- .../default/xui/it/menu_inspect_avatar_gear.xml | 2 + .../skins/default/xui/it/menu_inventory.xml | 11 +- .../skins/default/xui/it/menu_inventory_add.xml | 2 +- indra/newview/skins/default/xui/it/menu_login.xml | 2 +- indra/newview/skins/default/xui/it/menu_object.xml | 12 +- .../skins/default/xui/it/menu_participant_list.xml | 18 +- .../skins/default/xui/it/menu_people_nearby.xml | 3 + .../xui/it/menu_people_nearby_multiselect.xml | 1 + .../skins/default/xui/it/menu_profile_overflow.xml | 6 + indra/newview/skins/default/xui/it/menu_viewer.xml | 80 ++-- .../newview/skins/default/xui/it/notifications.xml | 191 +++++----- .../default/xui/it/panel_adhoc_control_panel.xml | 16 +- .../default/xui/it/panel_avatar_list_item.xml | 1 + .../default/xui/it/panel_block_list_sidetray.xml | 6 +- .../skins/default/xui/it/panel_bottomtray.xml | 17 +- .../skins/default/xui/it/panel_classified_info.xml | 17 +- .../skins/default/xui/it/panel_edit_profile.xml | 5 +- .../newview/skins/default/xui/it/panel_friends.xml | 2 +- .../default/xui/it/panel_group_control_panel.xml | 20 +- .../skins/default/xui/it/panel_group_general.xml | 24 +- .../default/xui/it/panel_group_info_sidetray.xml | 43 ++- .../skins/default/xui/it/panel_group_invite.xml | 10 +- .../default/xui/it/panel_group_land_money.xml | 106 +++--- .../skins/default/xui/it/panel_group_list_item.xml | 1 + .../skins/default/xui/it/panel_group_notices.xml | 4 +- .../skins/default/xui/it/panel_group_notify.xml | 2 +- .../skins/default/xui/it/panel_group_roles.xml | 4 +- .../default/xui/it/panel_im_control_panel.xml | 36 +- .../skins/default/xui/it/panel_landmark_info.xml | 1 + .../skins/default/xui/it/panel_landmarks.xml | 2 +- indra/newview/skins/default/xui/it/panel_login.xml | 34 +- .../skins/default/xui/it/panel_main_inventory.xml | 2 +- indra/newview/skins/default/xui/it/panel_me.xml | 4 +- .../xui/it/panel_media_settings_security.xml | 6 +- .../skins/default/xui/it/panel_my_profile.xml | 58 ++- .../skins/default/xui/it/panel_navigation_bar.xml | 9 +- indra/newview/skins/default/xui/it/panel_notes.xml | 2 +- .../default/xui/it/panel_outfits_inventory.xml | 17 +- .../it/panel_outfits_inventory_gear_default.xml | 4 +- .../newview/skins/default/xui/it/panel_people.xml | 18 +- .../skins/default/xui/it/panel_place_profile.xml | 57 +-- .../newview/skins/default/xui/it/panel_places.xml | 11 +- .../default/xui/it/panel_preferences_advanced.xml | 41 +- .../default/xui/it/panel_preferences_alerts.xml | 6 +- .../default/xui/it/panel_preferences_chat.xml | 12 +- .../default/xui/it/panel_preferences_general.xml | 19 +- .../default/xui/it/panel_preferences_graphics1.xml | 4 +- .../default/xui/it/panel_preferences_privacy.xml | 7 +- .../default/xui/it/panel_preferences_setup.xml | 22 +- .../default/xui/it/panel_preferences_sound.xml | 17 +- .../default/xui/it/panel_prim_media_controls.xml | 61 ++- .../newview/skins/default/xui/it/panel_profile.xml | 64 ++-- .../skins/default/xui/it/panel_region_covenant.xml | 2 +- .../skins/default/xui/it/panel_region_estate.xml | 9 +- .../skins/default/xui/it/panel_region_texture.xml | 4 +- .../skins/default/xui/it/panel_side_tray.xml | 23 +- .../skins/default/xui/it/panel_status_bar.xml | 6 +- .../default/xui/it/panel_teleport_history.xml | 4 + .../skins/default/xui/it/sidepanel_appearance.xml | 11 +- .../skins/default/xui/it/sidepanel_item_info.xml | 55 +-- .../skins/default/xui/it/sidepanel_task_info.xml | 97 ++--- indra/newview/skins/default/xui/it/strings.xml | 418 +++++++++++---------- 107 files changed, 1283 insertions(+), 1231 deletions(-) diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml index 15cc6cd1ba..951670ec7e 100644 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml @@ -84,7 +84,7 @@ Prévisualiser : -