livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29880 Make movelock messages even a bit more helpful...

meow-7.2.2
PanteraPolnocy 2020-11-16 18:45:20 +01:00
parent 5a536e8aa3
commit cc9af719e2
15 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fslslbridge.cpp
View File

@ -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());
}
// <FS:PP> 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");
}
// </FS:PP>
@ -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
{

4
indra/newview/llviewermenu.cpp
View File

@ -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

9
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -4944,6 +4944,15 @@ Möchten Sie diese Informationen übermitteln?
<notification name="MovelockDisabled">
Movelock deaktiviert.
</notification>
<notification name="MovelockEnabling">
Aktiviere Movelock...
</notification>
<notification name="MovelockDisabling">
Deaktiviere Movelock...
</notification>
<notification name="FlightAssistEnabled">
Flug-Assistent ist aktiviert.
</notification>
<notification label="Alle Einstellungen zurücksetzen" name="FirestormClearSettingsPrompt">
Ein Zurücksetzen aller Einstellungen kann bei Problemen hilfreich sein, allerdings müssen Sie anschließend jegliche Anpassungen erneut vornehmen.

14
indra/newview/skins/default/xui/de/strings.xml
View File

@ -6583,19 +6583,7 @@ Support-Bereich der Website Secondlife.com und melden Sie das Problem.
</string>
<string name="MovelockEnabled">
Movelock aktiviert.
</string>
<string name="MovelockDisabled">
Movelock deaktiviert.
</string>
<string name="MovelockEnabling">
Aktiviere Movelock...
</string>
<string name="MovelockDisabling">
Deaktiviere Movelock...
</string>
<string name="FlightAssistEnabled">
Flug-Assistent ist aktiviert.
Avatar &gt; Bewegung &gt; Movelock ist aktiviert.
</string>
<string name="BusyResponse">
Beschäftigt-Nachricht

21
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -10593,6 +10593,27 @@ Movelock enabled. Use Avatar &gt; Movement &gt; Movelock to disable.
Movelock disabled.
</notification>
<notification
icon="notifytip.tga"
name="MovelockEnabling"
type="notifytip">
Enabling movelock...
</notification>
<notification
icon="notifytip.tga"
name="MovelockDisabling"
type="notifytip">
Disabling movelock...
</notification>
<notification
icon="notifytip.tga"
name="FlightAssistEnabled"
type="notifytip">
Flight Assist is enabled
</notification>
<!-- Firestorm Phantom -->
<!-- Firestorm Reset Settings -->

6
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2829,11 +2829,7 @@ Try enclosing path to the editor with double quotes.
<string name="Collision_PhysicalObject">[NAME] hit you with a physical object.</string>
<string name="Collision_UnknownType">[NAME] caused a collision of unknown type.</string>
<string name="MovelockEnabled">Movelock enabled</string>
<string name="MovelockDisabled">Movelock disabled</string>
<string name="MovelockEnabling">Enabling movelock...</string>
<string name="MovelockDisabling">Disabling movelock...</string>
<string name="FlightAssistEnabled">Flight Assist is enabled</string>
<string name="MovelockEnabled">Avatar &gt; Movement &gt; Movelock is enabled</string>
<string name="BusyResponse">busy response</string>

3
indra/newview/skins/default/xui/es/strings.xml
View File

@ -5957,8 +5957,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Collision_ScriptedObject">[NAME] te ha golpeado con un objeto con scripts.</string>
<string name="Collision_PhysicalObject">[NAME] te ha golpeado con un objeto físico.</string>
<string name="Collision_UnknownType">[NAME] ha causado una colisión de tipo desconocido.</string>
<string name="MovelockEnabled">Bloqueo de movimiento activado</string>
<string name="MovelockDisabled">Bloqueo de movimiento desactivado</string>
<string name="MovelockEnabled">Avatar &gt; Movimiento &gt; Bloquear activado</string>
<string name="BusyResponse">respuesta de ocupado</string>
<string name="TeleportMaturityExceeded">
El residente no puede visitar esta región.

6
indra/newview/skins/default/xui/it/notifications.xml
View File

@ -3892,6 +3892,12 @@ Inviare queste informazioni?
<notification name="MovelockDisabled">
Blocco movimenti inattivo.
</notification>
<notification name="MovelockEnabling">
Abilitazione blocco...
</notification>
<notification name="MovelockDisabling">
Disabilitazione blocco...
</notification>
<notification label="Ripristino della configurazione" name="FirestormClearSettingsPrompt">
Ripristinare completamente la configurazione può essere utile in caso di problemi. Tuttavia tutte le personalizzazioni rispetto all&apos;originale dovranno essere rifatte.

11
indra/newview/skins/default/xui/it/strings.xml
View File

@ -5802,16 +5802,7 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
[NAME] ha causato una collisione sconosciuta.
</string>
<string name="MovelockEnabled">
Blocco movimenti attivo
</string>
<string name="MovelockDisabled">
Blocco movimenti inattivo
</string>
<string name="MovelockEnabling">
Abilitazione blocco...
</string>
<string name="MovelockDisabling">
Disabilitazione blocco...
Io &gt; Movimento &gt; Blocca attivo
</string>
<string name="BusyResponse">
busy response

9
indra/newview/skins/default/xui/ja/notifications.xml
View File

@ -4289,6 +4289,15 @@ AO セット "[AO_SET_NAME]" の名前を変更できません。
<notification name="MovelockDisabled">
ムーブメントロックが解除されました
</notification>
<notification name="MovelockEnabling">
ムーブメントロックを起動中です...
</notification>
<notification name="MovelockDisabling">
ムーブメントロックを解除中です...
</notification>
<notification name="FlightAssistEnabled">
飛行アシストが有効になりました
</notification>
<!-- Firestorm Phantom -->
<!-- Firestorm Reset Settings -->

4
indra/newview/skins/default/xui/ja/strings.xml
View File

@ -5989,10 +5989,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
<string name="Collision_UnknownType">[NAME] caused a collision of unknown type.</string>
<string name="MovelockEnabled">ムーブメントロックが有効になりました</string>
<string name="MovelockDisabled">ムーブメントロックが解除されました</string>
<string name="MovelockEnabling">ムーブメントロックを起動中です...</string>
<string name="MovelockDisabling">ムーブメントロックを解除中です...</string>
<string name="FlightAssistEnabled">飛行アシストが有効になりました</string>
<string name="BusyResponse">
取り込み時の自動応答

9
indra/newview/skins/default/xui/pl/notifications.xml
View File

@ -3953,6 +3953,15 @@ Czy chcesz jej/mu wysłać te informacje?
<notification name="MovelockDisabled">
Blokada pozycji została wyłączona.
</notification>
<notification name="MovelockEnabling">
Włączanie blokady pozycji...
</notification>
<notification name="MovelockDisabling">
Wyłączanie blokady pozycji...
</notification>
<notification name="FlightAssistEnabled">
Pomocnik lotu jest włączony
</notification>
<notification label="Resetuj wszystkie ustawienia" name="FirestormClearSettingsPrompt">
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.

14
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -5701,19 +5701,7 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu.
[NAME] spowodował/a nieznany typ kolizji.
</string>
<string name="MovelockEnabled">
Blokada pozycji została włączona
</string>
<string name="MovelockDisabled">
Blokada pozycji została wyłączona
</string>
<string name="MovelockEnabling">
Włączanie blokady pozycji...
</string>
<string name="MovelockDisabling">
Wyłączanie blokady pozycji...
</string>
<string name="FlightAssistEnabled">
Pomocnik lotu jest włączony
Awatar &gt; Ruch &gt; Unieruchom jest włączone
</string>
<string name="BusyResponse">
Wiadomość zajętości

9
indra/newview/skins/default/xui/ru/notifications.xml
View File

@ -4062,6 +4062,15 @@ URL: [AUDIOURL]
<notification name="MovelockDisabled">
Блокировка движения выключена.
</notification>
<notification name="MovelockEnabling">
Включение блокировки движения...
</notification>
<notification name="MovelockDisabling">
Выключение блокировки движения...
</notification>
<notification name="FlightAssistEnabled">
Помощь при полете включена
</notification>
<notification label="Сброс всех настроек" name="FirestormClearSettingsPrompt">
Сброс всех настроек может быть полезен, если вы испытываете проблемы; Однако, вам нужно будет переделывать настройки, которые вы сделали ранее.

14
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -6309,19 +6309,7 @@ http://www.firestormviewer.org/support за помощь в решении эт
[NAME] является причиной столкновения неизвестного типа.
</string>
<string name="MovelockEnabled">
Блокировка движения включена
</string>
<string name="MovelockDisabled">
Блокировка движения выключена
</string>
<string name="MovelockEnabling">
Включение блокировки движения...
</string>
<string name="MovelockDisabling">
Выключение блокировки движения...
</string>
<string name="FlightAssistEnabled">
Помощь при полете включена
Аватар &gt; Движение &gt; Заблокировать включена
</string>
<string name="BusyResponse">
ответ занятости