From 4f5d78522632920586e7e4bf7acbc908f9492edb Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 25 Oct 2019 17:32:19 +0300 Subject: SL-12014 Animesh is now a separate rendering type --- indra/newview/skins/default/xui/en/menu_viewer.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 7bb7b5d62c..96996156c0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1749,6 +1749,17 @@ function="Advanced.ToggleRenderType" parameter="character" /> + + + + Date: Fri, 25 Oct 2019 20:13:58 +0300 Subject: SL-12014 Removed dupplicate shortcut --- indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 96996156c0..be2317b313 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1751,8 +1751,7 @@ + name="Rendering Type Control Avatar"> -- cgit v1.2.3 From ff002e65f85aa8613cc9a49bd2ec68a754defd70 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 5 Dec 2019 14:53:24 +0200 Subject: SL-10991 Renamed button to highlight that these are voice options --- indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 c2995393fd..73fe36a8b4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -475,12 +475,12 @@ follows="left|top" height="23" is_toggle="true" - label="Input/Output devices" + label="Voice Input/Output devices" layout="topleft" left="20" top_pad="6" name="device_settings_btn" - width="190"> + width="230"> Date: Wed, 11 Dec 2019 14:09:22 +0200 Subject: SL-11891 Change format to SLT to make things consistent --- indra/newview/skins/default/xui/en/floater_about_land.xml | 4 ++-- indra/newview/skins/default/xui/en/floater_inspect.xml | 2 +- indra/newview/skins/default/xui/en/panel_landmark_info.xml | 2 +- indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 a143adfa06..4a9aebbf09 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -123,8 +123,8 @@ No parcel selected. - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] - + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] + - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] - [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] + [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt] -- cgit v1.2.3 From e0d1586f8c62cdf6455b3ff853f9c22d866e102c Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 21 Jan 2020 17:02:53 +0200 Subject: SL-12494 Add some more key bindings --- indra/newview/skins/default/xui/en/menu_viewer.xml | 31 +++++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index af185d43b0..8e65a2ffb1 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -56,7 +56,8 @@ + name="Places" + shortcut="control|L"> @@ -85,11 +86,22 @@ + name="Camera Controls" + shortcut="control|K"> + + + + + name="Stop Animating My Avatar" + shortcut="alt|shift|A"> @@ -473,7 +486,8 @@ + name="Events" + shortcut="control|E"> @@ -662,7 +676,8 @@ tear_off="true"> + name="Sunrise" + shortcut="control|shift|O"> @@ -694,7 +709,8 @@ + name="Midnight" + shortcut="control|shift|Z"> @@ -1342,7 +1358,8 @@ + name="Upload Model" + shortcut="alt|control|U"> -- cgit v1.2.3 From 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 27 Jan 2020 17:54:02 +0200 Subject: SL-12475 add Inventory Favorites tab --- .../skins/default/xui/en/menu_inventory.xml | 7 ++++ .../skins/default/xui/en/panel_main_inventory.xml | 40 ++++++++++++++-------- indra/newview/skins/default/xui/en/strings.xml | 1 + 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 3bdbbb04d7..52fcdc5b58 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -358,6 +358,13 @@ parameter="model" /> + + + - - + + Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]. Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters]. + Click "Use as Favorites folder" on a folder of your choice. You can choose a different folder at any time. System folders cannot be used for Favorites. Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. No items found. Check the spelling of your search string and try again. -- cgit v1.2.3 From 0f948988b8c5e13852f765be41f6cf011c1924f1 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 5 Feb 2020 18:39:02 +0200 Subject: SL-12660 Hide top level domain name and IP address for simulators --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5661e7fe96..b4fdfc41f5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -28,7 +28,7 @@ Build Configuration [BUILD_CONFIG] -You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> SLURL: <nolink>[SLURL]</nolink> (global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) [SERVER_VERSION] -- cgit v1.2.3 From 2ae0d7a9545c51518012e803ebf4aa0c5bb08768 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 17 Feb 2020 17:43:00 +0200 Subject: =?UTF-8?q?SL-11867=20Show=20=E2=80=9CUnable=20to=20buy=E2=80=9D?= =?UTF-8?q?=20message=20via=20notification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skins/default/xui/en/floater_buy_currency.xml | 42 +++------------------- .../newview/skins/default/xui/en/notifications.xml | 12 +++++++ 2 files changed, 16 insertions(+), 38 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 553c5d51d0..061af1b67c 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -13,6 +13,10 @@ name="buy_currency"> Buy L$ [LINDENS] for approx. [LOCALAMOUNT] + + Unable to Buy + - - - Unable to Buy - - - - -- cgit v1.2.3 From 55477e74c79228feb9a5a2d8b970bb9cce2e57a1 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 10 Jul 2020 21:07:54 +0300 Subject: Reverted SL-12494 Change was moved to DRTVWR-514 --- indra/newview/skins/default/xui/en/menu_viewer.xml | 31 +++++----------------- 1 file changed, 7 insertions(+), 24 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c7ab26bc22..873b95926b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -56,8 +56,7 @@ + name="Places"> @@ -86,22 +85,11 @@ + name="Camera Controls"> - - - - + name="Stop Animating My Avatar"> @@ -471,8 +458,7 @@ + name="Events"> @@ -661,8 +647,7 @@ tear_off="true"> + name="Sunrise"> @@ -694,8 +679,7 @@ + name="Midnight"> @@ -1333,8 +1317,7 @@ function="World.EnvPreset" + name="Upload Model"> -- cgit v1.2.3 From c09e933012d4ba607a066f0e857c1e5e543a59c3 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 27 Jul 2020 23:06:05 +0300 Subject: SL-13650 Ice level Slider Graduation --- indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') 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 bec793bbee..6f82a0efa1 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 @@ -203,10 +203,10 @@ Ice Level: Date: Fri, 21 Aug 2020 20:14:26 +0300 Subject: SL-13835 SSL verification should not crash on invalid certificate --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 73ee8332cc..30416768cd 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -108,6 +108,7 @@ Voice Server Version: [VOICE_VERSION] The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. + Failed to allocate openssl memory for certificate. Network error: Could not establish connection, please check your network connection. Login failed. -- cgit v1.2.3 From be48bee98f3da0e956a777f4478e010fed7c66eb Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 27 Aug 2020 12:33:32 +0300 Subject: SL-13835 Fixed warning for certificate --- indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++ indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 12 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 32a801e1a3..a0d56a0d08 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3691,6 +3691,17 @@ Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the curr yestext="OK"/> + +Could not connect to the server. +[REASON] + fail + + + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 30416768cd..8a7923dd26 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -107,6 +107,7 @@ Voice Server Version: [VOICE_VERSION] The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. + Could not load cetrificate. Please contact your Grid administrator. The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. Failed to allocate openssl memory for certificate. -- cgit v1.2.3 From a8b5ca77dc7bb3afb64df7910a3751d799c1ac74 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 27 Aug 2020 17:27:11 +0300 Subject: SL-13835 Typo --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 8a7923dd26..585cf3f001 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -107,7 +107,7 @@ Voice Server Version: [VOICE_VERSION] The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administrator. The certificate returned by the server could not be used for SSL. Please contact your Grid administrator. Too many certificates were in the servers Certificate chain. Please contact your Grid administrator. - Could not load cetrificate. Please contact your Grid administrator. + Could not load certificate. Please contact your Grid administrator. The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator. Failed to allocate openssl memory for certificate. -- cgit v1.2.3 From d50131c0ac43cb5cfc247bd388a10100bc3dfec0 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 9 Sep 2020 00:49:09 +0300 Subject: Revert "SL-12475 add Inventory Favorites tab" This reverts commit 92499ce1b43fd60ce7aad71d12f9eef0cef04f7f. # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h --- .../skins/default/xui/en/menu_inventory.xml | 7 ---- .../skins/default/xui/en/panel_main_inventory.xml | 40 ++++++++-------------- indra/newview/skins/default/xui/en/strings.xml | 1 - 3 files changed, 14 insertions(+), 34 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index adefa261aa..9aa84c1bac 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -393,13 +393,6 @@ parameter="model" /> - - - - - + + Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]. Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters]. - Click "Use as Favorites folder" on a folder of your choice. You can choose a different folder at any time. System folders cannot be used for Favorites. Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. No items found. Check the spelling of your search string and try again. -- cgit v1.2.3