From cc9af719e25ede2740902a3def40360bccd4a9de Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 16 Nov 2020 18:45:20 +0100 Subject: [PATCH] FIRE-29880 Make movelock messages even a bit more helpful... --- indra/newview/fslslbridge.cpp | 6 +++--- indra/newview/llviewermenu.cpp | 4 ++-- .../skins/default/xui/de/notifications.xml | 9 ++++++++ .../newview/skins/default/xui/de/strings.xml | 14 +------------ .../skins/default/xui/en/notifications.xml | 21 +++++++++++++++++++ .../newview/skins/default/xui/en/strings.xml | 6 +----- .../newview/skins/default/xui/es/strings.xml | 3 +-- .../skins/default/xui/it/notifications.xml | 6 ++++++ .../newview/skins/default/xui/it/strings.xml | 11 +--------- .../skins/default/xui/ja/notifications.xml | 9 ++++++++ .../newview/skins/default/xui/ja/strings.xml | 4 ---- .../skins/default/xui/pl/notifications.xml | 9 ++++++++ .../newview/skins/default/xui/pl/strings.xml | 14 +------------ .../skins/default/xui/ru/notifications.xml | 9 ++++++++ .../newview/skins/default/xui/ru/strings.xml | 14 +------------ 15 files changed, 74 insertions(+), 65 deletions(-) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index e67f725c52..ad8c49cc4c 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -265,14 +265,14 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, if (gSavedPerAccountSettings.getF32("UseLSLFlightAssist") > 0.f) { viewerToLSL(llformat("UseLSLFlightAssist|%.1f", gSavedPerAccountSettings.getF32("UseLSLFlightAssist")) ); - report_to_nearby_chat(LLTrans::getString("FlightAssistEnabled")); + LLNotificationsUtil::add("FlightAssistEnabled", LLSD()); } // Inform user, if movelock was enabled at login if (gSavedPerAccountSettings.getBOOL("UseMoveLock")) { updateBoolSettingValue("UseMoveLock"); - report_to_nearby_chat(LLTrans::getString("MovelockEnabling")); + LLNotificationsUtil::add("MovelockEnabling", LLSD()); make_ui_sound("UISndMovelockToggle"); } // @@ -291,7 +291,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { // Don't call for update here and only change setting to 'false', getCommitSignal()->connect->boost in llviewercontrol.cpp will send a message to Bridge anyway gSavedPerAccountSettings.setBOOL("UseMoveLock", false); - report_to_nearby_chat(LLTrans::getString("MovelockDisabling")); + LLNotificationsUtil::add("MovelockDisabling", LLSD()); } else { diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index fe71a012fc..65ade53e8e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4644,11 +4644,11 @@ class FSSelfToggleMoveLock : public view_listener_t gSavedPerAccountSettings.setBOOL("UseMoveLock", new_value); if (new_value) { - report_to_nearby_chat(LLTrans::getString("MovelockEnabling")); + LLNotificationsUtil::add("MovelockEnabling", LLSD()); } else { - report_to_nearby_chat(LLTrans::getString("MovelockDisabling")); + LLNotificationsUtil::add("MovelockDisabling", LLSD()); } } #ifdef OPENSIM diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 494fce6aff..7c9d72e37c 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -4944,6 +4944,15 @@ Möchten Sie diese Informationen übermitteln? Movelock deaktiviert. + + Aktiviere Movelock... + + + Deaktiviere Movelock... + + + Flug-Assistent ist aktiviert. + Ein Zurücksetzen aller Einstellungen kann bei Problemen hilfreich sein, allerdings müssen Sie anschließend jegliche Anpassungen erneut vornehmen. diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 97fa3ff8cd..3b57774113 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -6583,19 +6583,7 @@ Support-Bereich der Website Secondlife.com und melden Sie das Problem. - Movelock aktiviert. - - - Movelock deaktiviert. - - - Aktiviere Movelock... - - - Deaktiviere Movelock... - - - Flug-Assistent ist aktiviert. + Avatar > Bewegung > Movelock ist aktiviert. Beschäftigt-Nachricht diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6a7b80a98f..9f76ec5cc0 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10593,6 +10593,27 @@ Movelock enabled. Use Avatar > Movement > Movelock to disable. Movelock disabled. + +Enabling movelock... + + + +Disabling movelock... + + + +Flight Assist is enabled + + diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c42f6fd64e..9e1e91edb8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2829,11 +2829,7 @@ Try enclosing path to the editor with double quotes. [NAME] hit you with a physical object. [NAME] caused a collision of unknown type. - Movelock enabled - Movelock disabled - Enabling movelock... - Disabling movelock... - Flight Assist is enabled + Avatar > Movement > Movelock is enabled busy response diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 39668a8493..4fe4cde7a7 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -5957,8 +5957,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas [NAME] te ha golpeado con un objeto con scripts. [NAME] te ha golpeado con un objeto físico. [NAME] ha causado una colisión de tipo desconocido. - Bloqueo de movimiento activado - Bloqueo de movimiento desactivado + Avatar > Movimiento > Bloquear activado respuesta de ocupado El residente no puede visitar esta región. diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 10bfc9d079..368df127b7 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -3892,6 +3892,12 @@ Inviare queste informazioni? Blocco movimenti inattivo. + + Abilitazione blocco... + + + Disabilitazione blocco... + Ripristinare completamente la configurazione può essere utile in caso di problemi. Tuttavia tutte le personalizzazioni rispetto all'originale dovranno essere rifatte. diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 9f422a1d27..ff30f51e16 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5802,16 +5802,7 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. [NAME] ha causato una collisione sconosciuta. - Blocco movimenti attivo - - - Blocco movimenti inattivo - - - Abilitazione blocco... - - - Disabilitazione blocco... + Io > Movimento > Blocca attivo busy response diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 4c8b3bcd83..d5b27a2596 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -4289,6 +4289,15 @@ AO セット "[AO_SET_NAME]" の名前を変更できません。 ムーブメントロックが解除されました + + ムーブメントロックを起動中です... + + + ムーブメントロックを解除中です... + + + 飛行アシストが有効になりました + diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 71e60fc427..79f1abf6fb 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -5989,10 +5989,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ [NAME] caused a collision of unknown type. ムーブメントロックが有効になりました - ムーブメントロックが解除されました - ムーブメントロックを起動中です... - ムーブメントロックを解除中です... - 飛行アシストが有効になりました 取り込み時の自動応答 diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 4ce8aa817a..d845f7c566 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -3953,6 +3953,15 @@ Czy chcesz jej/mu wysłać te informacje? Blokada pozycji została wyłączona. + + Włączanie blokady pozycji... + + + Wyłączanie blokady pozycji... + + + Pomocnik lotu jest włączony + Resetowanie ustawień może się przydać, gdy napotykasz na jakieś problemy - pamiętaj jednak, że trzeba będzie wprowadzić od nowa wszystkie zmiany, jakie zostały przez Ciebie ustawione do tej pory. diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 7fc661fece..9f8fc2822b 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -5701,19 +5701,7 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu. [NAME] spowodował/a nieznany typ kolizji. - Blokada pozycji została włączona - - - Blokada pozycji została wyłączona - - - Włączanie blokady pozycji... - - - Wyłączanie blokady pozycji... - - - Pomocnik lotu jest włączony + Awatar > Ruch > Unieruchom jest włączone Wiadomość zajętości diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 8ad7638369..6dd424160d 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -4062,6 +4062,15 @@ URL: [AUDIOURL] Блокировка движения выключена. + + Включение блокировки движения... + + + Выключение блокировки движения... + + + Помощь при полете включена + Сброс всех настроек может быть полезен, если вы испытываете проблемы; Однако, вам нужно будет переделывать настройки, которые вы сделали ранее. diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index b98abbae8e..b80bcc0bfb 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -6309,19 +6309,7 @@ http://www.firestormviewer.org/support за помощь в решении эт [NAME] является причиной столкновения неизвестного типа. - Блокировка движения включена - - - Блокировка движения выключена - - - Включение блокировки движения... - - - Выключение блокировки движения... - - - Помощь при полете включена + Аватар > Движение > Заблокировать включена ответ занятости