diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index afbd5fca7f..d4942fa0f5 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -963,6 +963,17 @@ Value 0 + MoveLockInfoVisibleOnScreen + + Comment + If movelock built-in into LSL Bridge is active, then show info on screen all the time + Persist + 1 + Type + Boolean + Value + 1 + BridgeIntegrationOC Comment diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 084e409594..47fbba1645 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -38,6 +38,7 @@ #include "llavatarappearance.h" #include "llinventoryfunctions.h" #include "llmaniptranslate.h" +#include "llnotificationsutil.h" #include "llpreviewscript.h" #include "llselectmgr.h" #include "llsdutil.h" @@ -272,6 +273,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { updateBoolSettingValue("UseMoveLock"); report_to_nearby_chat(LLTrans::getString("MovelockEnabling")); + make_ui_sound("UISndMovelockToggle"); } // @@ -284,6 +286,7 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, // Not called right after logging in, and only if movelock was enabled during transition else if (gSavedPerAccountSettings.getBOOL("UseMoveLock")) { + make_ui_sound("UISndMovelockToggle"); if (!gSavedSettings.getBOOL("RelockMoveLockAfterRegionChange")) { // 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 @@ -450,11 +453,13 @@ bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, { if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 1) == "1") { - report_to_nearby_chat(LLTrans::getString("MovelockEnabled")); + LLNotificationsUtil::add("MovelockEnabled", LLSD()); + report_to_nearby_chat("--- " + LLTrans::getString("MovelockEnabled")); } else if (message.substr(valuepos + FS_STATE_ATTRIBUTE.size(), 1) == "0") { - report_to_nearby_chat(LLTrans::getString("MovelockDisabled")); + LLNotificationsUtil::add("MovelockDisabled", LLSD()); + report_to_nearby_chat("--- " + LLTrans::getString("MovelockDisabled")); } else { diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 49ba9aaa7c..b0982cdd16 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5524,6 +5524,7 @@ void LLAgent::renderAutoPilotTarget() // Phantom mode void LLAgent::togglePhantom() { + make_ui_sound("UISndMovelockToggle"); mPhantom = !mPhantom; if (mPhantom) { diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 65dd036aac..2119ce1963 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -389,6 +389,7 @@ public: static const std::string beacon_sun = LLTrans::getString("BeaconSun"); static const std::string beacon_moon = LLTrans::getString("BeaconMoon"); static const std::string particle_hiding = LLTrans::getString("ParticleHiding"); + static const std::string movelock_enabled = LLTrans::getString("MovelockEnabled"); // FIRE-29880: Movelock // Draw the statistics in a light gray // and in a thin font @@ -794,6 +795,16 @@ public: ypos += y_inc; } + // FIRE-29880: Movelock + static LLCachedControl fsRenderMovelockState(gSavedPerAccountSettings, "UseMoveLock"); + static LLCachedControl fsRenderMovelockText(gSavedPerAccountSettings, "MoveLockInfoVisibleOnScreen"); + if (fsRenderMovelockState && fsRenderMovelockText) + { + addText(xpos, ypos, movelock_enabled); + ypos += y_inc; + } + // + // pull the text saying if particles are hidden out from beacons if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES)) { diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 98ce1a0652..519ac7f15d 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -4906,6 +4906,12 @@ Möchten Sie diese Informationen übermitteln? Phantom-Modus ausgeschaltet. + + Movelock aktiviert. + + + Movelock deaktiviert. + 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/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f3c9386944..c09117c8e5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10523,6 +10523,20 @@ Phantom mode on. Phantom mode off. + +Movelock enabled. + + + +Movelock disabled. + + diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 4c828169fc..d38f55d21d 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -5431,6 +5431,12 @@ El nombre NO puede contener los caracteres ":" o "|". Modo fantasma desactivado. + + Bloqueo de movimiento activado. + + + Bloqueo de movimiento desactivado. + Restablecer todas las configuraciones puede ser útil si estás experimentando problemas, aunque tendrás que repetir todas las personalizaciones que hayas podido hacer a la configuración por defecto. diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index 70dc6545a1..f8101b3721 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -3857,6 +3857,12 @@ Inviare queste informazioni? Modalità fantasma non attiva. + + Blocco movimenti attivo. + + + Blocco movimenti inattivo. + 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/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 7b09e4e556..a08eefeb43 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -4280,6 +4280,12 @@ AO セット "[AO_SET_NAME]" の名前を変更できません。 ファントム・モードがオフになりました。 + + ムーブメントロックが有効になりました + + + ムーブメントロックが解除されました + diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index 656c84f82f..2d88ecdbda 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -3933,6 +3933,12 @@ Czy chcesz jej/mu wysłać te informacje? Tryb widmowy wyłączony. + + Blokada pozycji została włączona. + + + Blokada pozycji została wyłączona. + 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/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index 934643f44a..d5e3f489f4 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -4034,6 +4034,12 @@ URL: [AUDIOURL] Фантомный режим выключен. + + Блокировка движения включена. + + + Блокировка движения выключена. + Сброс всех настроек может быть полезен, если вы испытываете проблемы; Однако, вам нужно будет переделывать настройки, которые вы сделали ранее.