From eeb1970f79d34de3c8d531ae7d7da52d30246c36 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Thu, 3 Dec 2009 11:57:58 +0200 Subject: fixed normal bug EXT-3038 (Verb buttons in avatar profile panel don't have tool-tips) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_my_profile.xml | 2 ++ indra/newview/skins/default/xui/en/panel_picks.xml | 3 +++ 2 files changed, 5 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml index fe3e010cf9..3c87331199 100644 --- a/indra/newview/skins/default/xui/en/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml @@ -416,6 +416,7 @@ left="10" label="Edit Profile" name="edit_profile_btn" + tool_tip="Edit your personal information" width="130" /> Date: Fri, 4 Dec 2009 14:00:52 +0200 Subject: Work on normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well) -- removed member pointer to Notification Well Icon from the LLBottomTray -- placed Well counter over the Icon, made center-aligned --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_bottomtray.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 621dbdec61..2796b4a1f7 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -320,8 +320,8 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. min_height="28" top="0" name="notification_well_panel" - width="54" - min_width="54" + width="34" + min_width="34" user_resize="false"> + width="34"> + + - Date: Fri, 4 Dec 2009 18:33:13 +0200 Subject: =?UTF-8?q?implemented=20EXT-700=20=E2=80=9C"Offer"=20notification?= =?UTF-8?q?s=20should=20be=20accessible=20via=20chiclet=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f48cc6d4bf..0d7351395a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4499,14 +4499,14 @@ You don't have permission to copy this. + type="offer"> [NAME] received your inventory offer. + type="offer"> [NAME] declined your inventory offer. -- cgit v1.2.3 From 1a7013d5cf63006ff9f4d30b21c4f369915de332 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Fri, 4 Dec 2009 19:28:27 +0200 Subject: Implemented normal task EXT-2832 (Hide "undock" icon on the floaters). --HG-- branch : product-engine --- indra/newview/skins/default/textures/textures.xml | 3 --- indra/newview/skins/default/xui/en/strings.xml | 1 - indra/newview/skins/default/xui/en/widgets/floater.xml | 2 -- 3 files changed, 6 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index fbb910b847..771726d466 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -204,9 +204,6 @@ with the same filename but different name - - - diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e47ec1ebda..194e359e10 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -88,7 +88,6 @@ Minimize Tear Off Dock - Undock Show Help diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2263866471..70ee9fc3b8 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -13,13 +13,11 @@ minimize_image="Icon_Minimize_Foreground" tear_off_image="tearoffbox.tga" dock_image="Icon_Dock_Foreground" - undock_image="Icon_Undock_Foreground" help_image="Icon_Help_Foreground" close_pressed_image="Icon_Close_Press" restore_pressed_image="Icon_Restore_Press" minimize_pressed_image="Icon_Minimize_Press" tear_off_pressed_image="tearoff_pressed.tga" dock_pressed_image="Icon_Dock_Press" - undock_pressed_image="Icon_Undock_Press" help_pressed_image="Icon_Help_Press" /> -- cgit v1.2.3 From c28fd45839b0a1924c80bc289a90e4756e677472 Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Fri, 4 Dec 2009 20:46:04 +0200 Subject: omg fix for two omg crtical bugs... EXT-3109 Viewer crashes when attempting to select group role EXT-3130 Viewer crashes after pressing "New Role" button in group profile also a bit fix layout --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_group_roles.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 5bae5c2711..a5bab3232c 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -367,7 +367,7 @@ things in this group. There's a broad variety of Abilities. + Date: Mon, 7 Dec 2009 14:20:33 +0200 Subject: Aditional changes for normal task EXT-3081 (Separate Message Well on Notifications Well and IM Well) -- set different titles for IM & Notification Well windows -- set different anchors for IM & Notification Well windows --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/floater_sys_well.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 4e9388c2b2..3fc57372de 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -21,6 +21,15 @@ save_visibility="true" single_instance="true" > + + IM SESSIONS + + + NOTIFICATIONS + + Date: Mon, 7 Dec 2009 15:15:41 +0200 Subject: =?UTF-8?q?implemented=20EXT-2797=20=E2=80=9CMaking=20friendship?= =?UTF-8?q?=20offer=20should=20be=20recorded=20into=20IM=20history?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0d7351395a..c4946b895e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5128,6 +5128,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O text="Decline"/> + + + You have offered friendship to [TO_NAME] + Date: Mon, 7 Dec 2009 22:44:44 +0200 Subject: Fixed normal bug EXT-3018([BSI] Hook up "Go to My Dashboard" in Profile to link to http://secondlife.com/my) --HG-- branch : product-engine --- indra/newview/skins/default/xui/en/panel_edit_profile.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index a833ad97d9..bbf86089cb 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -50,6 +50,10 @@ name="partner_edit_link_url"> http://www.secondlife.com/account/partners.php?lang=en + + http://secondlife.com/my + @@ -256,7 +260,7 @@ layout="topleft" left="10" name="my_account_link" - value="Go to My Dashboard" + value="[[URL] Go to My Dashboard]" width="285" /> Date: Mon, 7 Dec 2009 16:25:08 -0800 Subject: L10N: Add much-needed linguistic context in the comments of strings.xml; L10N: consistency in phrasing on the 2 separate places in the Nav Bar where you create/edit a Landmark Also, add a separator to menu_NavBar so its easier to parse visually. --- indra/newview/skins/default/xui/en/menu_navbar.xml | 2 ++ indra/newview/skins/default/xui/en/strings.xml | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml index e17eeb46f6..b71b866c4b 100644 --- a/indra/newview/skins/default/xui/en/menu_navbar.xml +++ b/indra/newview/skins/default/xui/en/menu_navbar.xml @@ -27,6 +27,8 @@ + All + Buy Buy for L$ @@ -2008,8 +2009,8 @@ this texture in your inventory none - - (Unknown) + + (Unknown) @@ -2019,7 +2020,8 @@ this texture in your inventory Total No group data found for group - + parent estate mainland teen @@ -2108,8 +2110,8 @@ this texture in your inventory Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh - Add Landmark... - Edit Landmark... + Add to My Landmarks... + Edit my Landmark... ⌃ @@ -2780,7 +2782,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Add to My Landmarks - Edit My Landmark + Edit my Landmark See more info about the current location My location history Buy this land -- cgit v1.2.3 From 6301211b7c9fc214c6dcfb6b8a573e62a0fb9bad Mon Sep 17 00:00:00 2001 From: Ramzi Linden Date: Mon, 7 Dec 2009 17:28:39 -0800 Subject: EXT-2855 delete 2 more entries in strings.xml that are not actually user-visible --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index df991b173a..3b32912fbf 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2389,8 +2389,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Eyes Bugged -Eyes Shear Left Up -Eyes Shear Right Up + + -- cgit v1.2.3 From 5df04533f67abc3e0dce520d0ddb8d70bc7cae27 Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Tue, 8 Dec 2009 10:17:41 +0000 Subject: DEV-41358: Updated the Search URL to the new staging area. --- indra/newview/skins/default/xui/en/floater_search.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index c5d6f885d3..82e4d87b28 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -14,7 +14,7 @@ width="670"> - http://eniac21.lindenlab.com:10001/viewer + http://int.searchwww-phx0.damballah.lindenlab.com/viewer -- cgit v1.2.3 From da2a0385ae6ee8962ed5d4f991df95df13d8e89a Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Tue, 8 Dec 2009 10:28:45 +0000 Subject: DEV-43439: Remove Back/Forward/Home buttons from Home side panel. As per request from Yoz. They will add navigation buttons to the actual HTML content. --- .../default/xui/en/panel_sidetray_home_tab.xml | 55 +--------------------- 1 file changed, 2 insertions(+), 53 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 4b841b0a09..1dd4eb095c 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -20,58 +20,7 @@ top_pad="10" width="313"> - - - - - Date: Tue, 8 Dec 2009 11:22:45 +0000 Subject: EXT-2427: Added an About > Report Bug menu This menu brings up the Help Browser with the report_bug topic. To support this, I've created a new ShowHelp function that can be accessed from XUI. You can supply an optional help topic parameter, or if you specify no parameter then the default (F1) help is shown. --- indra/newview/skins/default/xui/en/menu_login.xml | 3 +-- indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index a22dc80f4e..9b439c16e0 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -45,8 +45,7 @@ name="Second Life Help" shortcut="F1"> + function="ShowHelp" /> + function="ShowHelp" /> + + + Date: Tue, 8 Dec 2009 12:20:22 +0000 Subject: EXT-2350: Added a help link to login panel. There is now a new "Need help logging in?" link on the right-hand side of the login panel. Clicking on this brings up the help browser with the pre_login_help topic (the same as pressing F1). --- indra/newview/skins/default/textures/textures.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_login.xml | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 7e309d2bad..6f9801491a 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -194,8 +194,8 @@ with the same filename but different name - - + + diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index efe26d3887..22977b2274 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -167,8 +167,8 @@ text_color="EmphasisColor" halign="right" height="16" - top="17" - left_pad="10" + top="12" + left_pad="5" right="-10" name="create_new_account_text" width="180"> @@ -185,6 +185,17 @@ width="180"> Forgot your name or password? + + Need help logging in? +