From 22c73576175750512d0dd47763e079c42a411e9e Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 12 Aug 2016 09:09:21 -0400 Subject: Add voice connection stats logging, make logging less verbose, some other code cleanup --- indra/newview/skins/default/xui/en/notifications.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 492d963653..eea1824040 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8547,6 +8547,8 @@ We're having trouble connecting to your voice server: [HOSTID] +:UDP: 3478, 3479, 5060, 5062, 12000-17000 + Voice communications will not be available. Please check your network and firewall setup. voice -- cgit v1.2.3 From 52926f72eaa278391ba91f149f88e5b90bfbdaa5 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 27 Feb 2017 12:46:07 -0500 Subject: VOICE-46: allow longer connection timeout, with fewer retries. Clarify ports needed. Remove pointless in-progress notice --- indra/newview/skins/default/xui/da/notifications.xml | 3 --- indra/newview/skins/default/xui/de/notifications.xml | 3 --- indra/newview/skins/default/xui/en/notifications.xml | 19 ++++++------------- indra/newview/skins/default/xui/es/notifications.xml | 3 --- indra/newview/skins/default/xui/fr/notifications.xml | 3 --- indra/newview/skins/default/xui/it/notifications.xml | 3 --- indra/newview/skins/default/xui/ja/notifications.xml | 3 --- indra/newview/skins/default/xui/pl/notifications.xml | 3 --- indra/newview/skins/default/xui/pt/notifications.xml | 3 --- indra/newview/skins/default/xui/ru/notifications.xml | 3 --- indra/newview/skins/default/xui/tr/notifications.xml | 3 --- indra/newview/skins/default/xui/zh/notifications.xml | 3 --- 12 files changed, 6 insertions(+), 46 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index 513394fa9b..283a7b2a43 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -1566,9 +1566,6 @@ Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik p Det lykkedes ikke at forbinde til [VOICE_CHANNEL_NAME], prøv venligst igen senere. Du vil nu blive koblet til almindelig voice-chat. - - Vi laver en stemmekanal til dig. Det kan tage op til et minut. - En eller flere af dine stemme "morphs" er udløbet. [[URL] Click here] for at forny dit abbonnement. diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 25e013ed90..c7ba67ccd5 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -3261,9 +3261,6 @@ Klicken Sie auf 'Akzeptieren ', um dem Chat beizutreten, oder auf &a Verbindung zu [VOICE_CHANNEL_NAME] nicht möglich. Bitte versuchen Sie es später. Sie werden nun wieder mit dem Chat in Ihrer Nähe verbunden. - - Wir erstellen einen Voice-Kanal für Sie. Bitte warten Sie einen Moment. - Ein oder mehrere Ihrer Voice-Morph-Abos ist/sind abgelaufen. [[URL] Hier klicken], um Ihr Abo zu erneuern. diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 235e622852..da777417ac 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8234,17 +8234,6 @@ Failed to connect to [VOICE_CHANNEL_NAME], please try again later. You will now - - -We are creating a voice channel for you. This may take up to one minute. - status - voice - - voice fail Fallo al conectar a [VOICE_CHANNEL_NAME]; por favor, inténtalo más tarde. Vas a ser reconectado al chat de voz. - - Estamos creando un canal de voz para ti. Se puede tardar hasta un minuto. - Una o más de las transformaciones de voz a las que estás suscrito han caducado. [Pulsa aquí [URL]] para renovar la suscripción. diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index b7efaad376..21826a9603 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -3247,9 +3247,6 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore Échec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement. Vous allez maintenant être reconnecté(e) au chat vocal près de vous. - - Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants. - Au moins l'un des effets de voix auxquels vous êtes abonné a expiré. [[URL] Cliquez ici] pour renouveler votre abonnement. diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 3621b3bc62..76579ccc13 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -3251,9 +3251,6 @@ Clicca su Accetta per unirti alla chat oppure su Declina per declinare l'in Collegamento a [VOICE_CHANNEL_NAME] non riuscito, riprova più tardi. Verrai ora ricollegato alla chat vocale nei dintorni. - - Stiamo creando una canale voice per te. Questo può richiedere fino a un minuto. - Almeno una delle manipolazioni vocali alle quali sei iscritto è scaduta. [[URL] Fai clic qui] per rinnovare l'abbonamento. diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 00d9b3ca5c..51ffd5fda0 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -3291,9 +3291,6 @@ M キーを押して変更します。 [VOICE_CHANNEL_NAME] への接続に失敗しました。あとで再度お試しください。 「近くのボイスチャット」に再接続されます。 - - ボイスチャンネルを作成しています。1 分ほどかかります。 - ボイスモーフィング効果の1つまたは複数の有効期限が終了しました。期限を延長・更新するには[[URL]こちらをクリック]してください。 diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index e92bdb8820..87e318be1b 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -2806,9 +2806,6 @@ Wybierz Zablokuj żeby wyciszyć tą osobę. Brak połączenia z [VOICE_CHANNEL_NAME], spróbuj później. Przełączanie do rozmowy w czacie lokalnym. - - Tworzymy kanał głosu dla Ciebie. To może potrwać minutę. - Subskrypcja jednego lub więcej Przekształceń Głosu wygasła. [[URL] Kliknij tutaj] oby odnowić subskrypcję. diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 53a418a1d8..0eacff11a7 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -3236,9 +3236,6 @@ Clique em Aceitar para atender ou em Recusar para recusar este convite. Clique Falha de conexão com [VOICE_CHANNEL_NAME]. Tente novamente mais tarde. Agora você será reconectado ao bate-papo local. - - Estamos criando uma canal de voz para você. Isto pode levar até um minuto. - Um ou mais serviços de distorção de voz que você assinou veceu. [[URL] Clique aqui] para renovar o serviço. diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 50931fc9b8..5f3a8571e8 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -3247,9 +3247,6 @@ http://secondlife.com/download. Не удалось подключиться к [VOICE_CHANNEL_NAME], повторите попытку позже. Будет установлено подключение к локальному голосовому чату. - - Создается голосовой канал для вас. Создание займет не больше минуты. - Истек срок действия одного или нескольких типов изменения голоса, на которые вы подписаны. [[URL] Щелкните здесь], чтобы обновить подписку. diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 0f222d49cc..7996a189e3 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -3246,9 +3246,6 @@ Sohbete katılmak için Kabul Et'i, daveti geri çevirmek için ise Reddet& [VOICE_CHANNEL_NAME] ile bağlantı kurulamadı, lütfen daha sonra tekrar deneyin. Şimdi Yakındaki bir Sesli Sohbete yeniden bağlanılacaksınız. - - Sizin için bir ses kanalı oluşturuyoruz. Bu işlem bir dakika kadar sürebilir. - Abone olduğunuz Ses Şekillerinden birinin ya da daha fazlasının süresi dolmuş. Aboneliğinizi yenilemek için [[URL] burayı tıklatın]. diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 5c794afd65..61cf4e9492 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -3236,9 +3236,6 @@ SHA1 指紋：[MD5_DIGEST] 無法連通 [VOICE_CHANNEL_NAME],，請稍候再試。 現在你將重新連通到附近的語音聊天。 - - 我們正為你建立語音頻道。 這至多可能需時一分鐘。 - 至少一個你訂用的變聲效果已經過期。 [[URL] 點按這裡] 繼續訂用。 -- cgit v1.2.3 From 6de7de20c05a49c4f30eaca34e11c21af3568e69 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 9 Mar 2017 12:04:28 -0500 Subject: split voice failure notice into permanent and retrying notices --- .../newview/skins/default/xui/en/notifications.xml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 04a636b09e..f21df2bfd4 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8686,6 +8686,29 @@ Ports that must be allowed for voice are: Please check your network and firewall setup. Disable any SIP ALG feature in your router. +We will keep trying... + voice + fail + + + + +We are unable to connect to the voice server: + +[HOSTID] + +Ports that must be allowed for voice are: +:TCP: 80, 443 +:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 + +Please check your network and firewall setup. +Disable any SIP ALG feature in your router. + Voice communications will not be available. voice fail -- cgit v1.2.3 From cb9bddf6834a024ea9a3f916853914c0dc298fd2 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 9 Mar 2017 16:47:34 -0500 Subject: add retries for Connection, remove user notices on retry (just tell them when we give up) --- .../newview/skins/default/xui/en/notifications.xml | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f21df2bfd4..96113a4fba 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8675,29 +8675,6 @@ Please check your network and firewall setup. icon="alertmodal.tga" name="NoVoiceConnect" type="alertmodal"> -We're having trouble connecting to your voice server: - -[HOSTID] - -Ports that must be allowed for voice are: -:TCP: 80, 443 -:UDP: 3478, 3479, 5060, 5062, 6250, 12000-32000 - -Please check your network and firewall setup. -Disable any SIP ALG feature in your router. - -We will keep trying... - voice - fail - - - - We are unable to connect to the voice server: [HOSTID] -- cgit v1.2.3 From 6464016c117693d391f8e5cdbc14816e298ec265 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 15 Nov 2017 19:15:49 +0200 Subject: MAINT-7997 Fixed dialog text failing to get focus when selected --- indra/newview/skins/default/xui/en/panel_notification.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml index 4d9316768b..c1a68fb9af 100644 --- a/indra/newview/skins/default/xui/en/panel_notification.xml +++ b/indra/newview/skins/default/xui/en/panel_notification.xml @@ -71,7 +71,6 @@ mouse_opaque="false" name="text_editor_box" read_only="true" - tab_stop="false" text_color="White" text_readonly_color="White" top="10" -- cgit v1.2.3 From c1e55d37b6f96a46d1c187c90508979b500eddf4 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 21 Nov 2017 18:32:18 +0200 Subject: MAINT-8016 Crash in LLFloaterAvatarRenderSettings::removePicker() --- indra/newview/skins/default/xui/en/floater_avatar_picker.xml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index dddb258ed9..af6d11f47e 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -47,7 +47,6 @@ top="20" width="500"> Date: Wed, 29 Nov 2017 16:14:43 +0200 Subject: MAINT-8033 Trash Count - folders are included in Alert --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9af4b299de..c6460c3c72 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6233,7 +6233,7 @@ The folder '[FOLDERNAME]' is a system folder. Deleting system folders icon="alertmodal.tga" name="ConfirmEmptyTrash" type="alertmodal"> -[COUNT] items will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash? +[COUNT] items and folders will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash? confirm Date: Wed, 13 Dec 2017 12:47:25 +0200 Subject: MAINT-8061 Consider including folder count along with object count --- indra/newview/skins/default/xui/en/panel_main_inventory.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index df70398599..d77fbdec0a 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -13,26 +13,27 @@ - Fetching [ITEM_COUNT] Items... [FILTER] + Fetching [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders... [FILTER] - [ITEM_COUNT] Items [FILTER] + [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER] - Fetched [ITEM_COUNT] Items [FILTER] + Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER] Items: -- cgit v1.2.3 From b309f058084d87744534adf647226b0a209a65f9 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 13 Dec 2017 14:20:50 +0200 Subject: MAINT-8061 Consider including folder count along with object count --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d7c8f95a3a..2aa5d2e5df 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2329,7 +2329,7 @@ If you continue to receive this message, please contact Second Life support for Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace]. - + ( [ITEMS_COUNT] Items ) stock folder must be contained by a version folder : Error: all items in a stock folder must be no-copy and of the same type -- cgit v1.2.3 From e84e4a1adf29b3a807c9d0c0e4841b5f12ea9756 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 11 Jan 2018 10:32:23 -0800 Subject: Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome build for CEF in the About box --- indra/newview/skins/default/xui/en/floater_about.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 60f36770bb..71f4d81195 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -8,14 +8,14 @@ help_topic="floater_about" save_rect="true" title="ABOUT [CAPITALIZED_APP_NAME]" - width="470"> + width="500"> - - - - - - Web: - - - - - Date: Wed, 24 Jan 2018 13:16:07 -0800 Subject: MAINT-8232 Clear History button description should not include 'web' --- indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 284688d4d1..f0a059ddb2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -19,7 +19,7 @@ follows="left|top" height="23" label="Clear History" - tool_tip="Clear login image, last location, teleport history, web, and texture cache" + tool_tip="Clear login image, last location, teleport history, and texture cache" layout="topleft" left="30" name="clear_cache" @@ -41,7 +41,7 @@ top_delta="3" text_color="LtGray_50" width="300"> - (Locations, images, web, search history) + (Locations, images, search history) Date: Thu, 25 Jan 2018 11:29:47 -0800 Subject: MAINT-8232 Clear History button description should not include 'web' - incorrect assertionm that web cache not cleared --- indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index f0a059ddb2..2ec5cef640 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -19,7 +19,7 @@ follows="left|top" height="23" label="Clear History" - tool_tip="Clear login image, last location, teleport history, and texture cache" + tool_tip="Clear login image, last location, teleport history, web and texture cache" layout="topleft" left="30" name="clear_cache" @@ -41,7 +41,7 @@ top_delta="3" text_color="LtGray_50" width="300"> - (Locations, images, search history) + (Locations, images, web, search history) Date: Fri, 26 Jan 2018 11:54:52 -0800 Subject: Fix for: MAINT-8138 Generate new page of test URLs for Dullahan that are more complete and more robust (last stage was creation of S3 non-user specific URL) --- indra/newview/skins/default/xui/en/floater_web_content.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 83118615f9..9a097d933b 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -178,7 +178,7 @@ width="22"> + parameter="https://sl-viewer-media-system.s3.amazonaws.com/index.html"/> Date: Fri, 2 Mar 2018 16:21:53 -0800 Subject: Replace start page for media browser with DuckDuckGo.com - Google page was offset at that window size and was irritating --- indra/newview/skins/default/xui/en/menu_login.xml | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 4e2f819023..07b3cc3bd8 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -245,7 +245,7 @@ name="Media Browser"> + parameter="http://duckduckgo.com"/> + parameter="http://duckduckgo.com"/>