From 4941749bb4d3b66f55c9c61d7e18305d92ec6986 Mon Sep 17 00:00:00 2001 From: Bjoseph Wombat Date: Tue, 10 Mar 2015 14:21:41 +0100 Subject: Added the loop back setting so people can hear themselves during the mic test. --- indra/newview/skins/default/xui/en/panel_sound_devices.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 46cbc1e87f..3dbb7fb7fc 100755 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -98,7 +98,7 @@ name="My volume label" top_pad="14" width="200"> - My volume: + Mic volume: Date: Thu, 24 Sep 2015 16:16:24 -0700 Subject: MAINT-5282: I've removed most of the depricated Merchant Outbox code and the links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory. (There may still be some outstanding Outbox code that was not obvious that I have missed.) --- indra/newview/skins/default/xui/en/menu_inventory.xml | 8 -------- indra/newview/skins/default/xui/en/menu_viewer.xml | 7 ------- 2 files changed, 15 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 91adec0789..3deb8f7233 100755 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -784,14 +784,6 @@ - - - - - - Date: Wed, 7 Oct 2015 16:09:08 -0700 Subject: MAINT-5691: Browser was using deprecated outbox display type AND not correctly returning error body to application. LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result VMM alert boxes now use type="alertmodal" rather than "outbox" --- .../newview/skins/default/xui/en/notifications.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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 f847c73287..66b52c586f 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -244,7 +244,7 @@ You don't have permission to copy one or more of these items to the Merchant Out + type="alertmodal"> A new folder has been created for each item you have transferred into the top level of your Merchant Outbox. @@ -257,7 +257,7 @@ A new folder has been created for each item you have transferred into the top le + type="alertmodal"> Success All folders were successfully sent to the Marketplace. @@ -271,7 +271,7 @@ All folders were successfully sent to the Marketplace. + type="alertmodal"> Some folders did not transfer Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox. @@ -286,7 +286,7 @@ See the [[MARKETPLACE_IMPORTS_URL] error log] for more information. + type="alertmodal"> Transfer failed with error '[ERROR_CODE]' No folders were sent to the Marketplace because of a system or network error. Try again later. @@ -299,7 +299,7 @@ No folders were sent to the Marketplace because of a system or network error. T + type="alertmodal"> Marketplace initialization failed with error '[ERROR_CODE]' Initialization with the Marketplace failed because of a system or network error. Try again later. @@ -312,7 +312,7 @@ Initialization with the Marketplace failed because of a system or network error. + type="alertmodal"> Copy or move to Stock Folder failed with error : '[ERROR_CODE]' @@ -325,7 +325,7 @@ Initialization with the Marketplace failed because of a system or network error. + type="alertmodal"> Copy or move to Marketplace Listings failed with error : '[ERROR_CODE]' @@ -338,7 +338,7 @@ Initialization with the Marketplace failed because of a system or network error. + type="alertmodal"> The transaction with the Marketplace failed with the following error : Reason : '[ERROR_REASON]' @@ -352,7 +352,7 @@ Initialization with the Marketplace failed because of a system or network error. + type="alertmodal"> We are unable to list this product or activate the version folder. Usually this is caused by missing information in the listing description form, but it may be due to errors in the folder structure. Either edit the listing or check the listing folder for errors. + type="alertmodal"> Listing to Marketplace failed with error : '[ERROR_CODE]' @@ -376,7 +376,7 @@ Initialization with the Marketplace failed because of a system or network error. + type="alertmodal"> Activating this version folder failed with error : '[ERROR_CODE]' -- cgit v1.2.3 From 908a79e9d14e613209efc61e394384d44ee9d5ba Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 2 Dec 2015 13:32:58 +0200 Subject: MAINT-1588 FIXED Square fonts in OSX mountain lion --- indra/newview/skins/default/xui/en/fonts.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index ebbb53729d..170b7177fb 100755 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -14,6 +14,7 @@ ヒラギノ角ゴ ProN W3.otf AppleGothic.dfont AppleGothic.ttf + AppleSDGothicNeo-Regular.otf 华文细黑.ttf -- cgit v1.2.3 From 35e1c735a3ce01e8f4c6fb24b173c019086a88cb Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 9 Dec 2015 14:00:42 +0200 Subject: MAINT-884 FIXED Spanish Mundo > Acerca del terreno > Opciones: overlapped texts --- indra/newview/skins/default/xui/es/floater_about_land.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 10907344ae..79493d3885 100755 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -353,10 +353,10 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. Foto: - + Los avatares de otras parcelas pueden ver a los avatares de esta parcela y chatear con ellos - + Punto de llegada: [LANDING] -- cgit v1.2.3 From fd8762f9f41c2da71d05e69166cbbed4cfb25fe9 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Mon, 14 Dec 2015 02:27:06 +0200 Subject: MAINT-5961 FIXED Incorrect position of "Delete all" button within "Notifications" floater --- .../newview/skins/default/xui/en/floater_notifications_tabbed.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml index c17d2a1f37..b5ae9db7e9 100644 --- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml @@ -136,16 +136,16 @@ - + - + - - -- cgit v1.2.3 From 3eb9a422d70472ef1f51f1df25a7e6910f06cf99 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 6 Jan 2016 12:06:27 +0200 Subject: MAINT-898 FIXED Viewer attempts to log in with no password --- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (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 b4c5cba1fd..5f0fa70e29 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1222,6 +1222,14 @@ You can not wear that item because it has not yet loaded. Please try again in a fail + + fail +Please enter your Password to log in. + + Date: Wed, 6 Jan 2016 16:55:58 +0200 Subject: MAINT-2233 FIXED Duplicate entries in notifications.xml --- .../newview/skins/default/xui/en/notifications.xml | 22 ---------------------- 1 file changed, 22 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 5f0fa70e29..7a70fb1a2a 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4169,28 +4169,6 @@ You have left the group [group_name]. yestext="OK"/> - -Unable to leave group: [reason]. - reason - - - - -You have left the group [group_name]. - group_name - - - Date: Mon, 11 Jan 2016 03:24:36 +0200 Subject: MAINT-6018 Open URL dialog spam Added the ability to close all notifications from one owner at once --- indra/newview/skins/default/xui/en/menu_script_chiclet.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml index db29d9cebc..ceeef1cd46 100755 --- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml @@ -16,4 +16,12 @@ function="ScriptChiclet.Action" parameter="end" /> + + + -- cgit v1.2.3 From 6df80ebcc4b547d3728ed5fca6fa4efa899f30ea Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Tue, 12 Jan 2016 21:08:27 +0200 Subject: MAINT-6018 Open URL dialog spam Removed "close by owner" item form chiclet's right-click menu --- indra/newview/skins/default/xui/en/menu_script_chiclet.xml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml index ceeef1cd46..db29d9cebc 100755 --- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml +++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml @@ -16,12 +16,4 @@ function="ScriptChiclet.Action" parameter="end" /> - - - -- cgit v1.2.3