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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2020-07-30 01:00:55 +02:00
parent 5d24687f94 6c4139ca1e
commit 5e9cf09547
11 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings_per_account.xml
View File

@ -963,6 +963,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>MoveLockInfoVisibleOnScreen</key>
<map>
<key>Comment</key>
<string>If movelock built-in into LSL Bridge is active, then show info on screen all the time</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>BridgeIntegrationOC</key>
<map>
<key>Comment</key>

9
indra/newview/fslslbridge.cpp
View File

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

1
indra/newview/llagent.cpp
View File

@ -5524,6 +5524,7 @@ void LLAgent::renderAutoPilotTarget()
// <FS> Phantom mode
void LLAgent::togglePhantom()
{
make_ui_sound("UISndMovelockToggle");
mPhantom = !mPhantom;
if (mPhantom)
{

11
indra/newview/llviewerwindow.cpp
View File

@ -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"); // <FS:PP> FIRE-29880: Movelock
// Draw the statistics in a light gray
// and in a thin font
@ -794,6 +795,16 @@ public:
ypos += y_inc;
}
// <FS:PP> FIRE-29880: Movelock
static LLCachedControl<bool> fsRenderMovelockState(gSavedPerAccountSettings, "UseMoveLock");
static LLCachedControl<bool> fsRenderMovelockText(gSavedPerAccountSettings, "MoveLockInfoVisibleOnScreen");
if (fsRenderMovelockState && fsRenderMovelockText)
{
addText(xpos, ypos, movelock_enabled);
ypos += y_inc;
}
// </FS:PP>
// <FS:LO> pull the text saying if particles are hidden out from beacons
if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES))
{

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

@ -4906,6 +4906,12 @@ Möchten Sie diese Informationen übermitteln?
<notification name="PhantomOff">
Phantom-Modus ausgeschaltet.
</notification>
<notification name="MovelockEnabled">
Movelock aktiviert.
</notification>
<notification name="MovelockDisabled">
Movelock deaktiviert.
</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/en/notifications.xml
View File

@ -10523,6 +10523,20 @@ Phantom mode on.
Phantom mode off.
</notification>
<notification
icon="notifytip.tga"
name="MovelockEnabled"
type="notifytip">
Movelock enabled.
</notification>
<notification
icon="notifytip.tga"
name="MovelockDisabled"
type="notifytip">
Movelock disabled.
</notification>
<!-- Firestorm Phantom -->
<!-- Firestorm Reset Settings -->

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

@ -5431,6 +5431,12 @@ El nombre NO puede contener los caracteres ":" o "|".
<notification name="PhantomOff">
Modo fantasma desactivado.
</notification>
<notification name="MovelockEnabled">
Bloqueo de movimiento activado.
</notification>
<notification name="MovelockDisabled">
Bloqueo de movimiento desactivado.
</notification>
<notification label="Restablecer todas las configuraciones" name="FirestormClearSettingsPrompt">
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.

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

@ -3857,6 +3857,12 @@ Inviare queste informazioni?
<notification name="PhantomOff">
Modalità fantasma non attiva.
</notification>
<notification name="MovelockEnabled">
Blocco movimenti attivo.
</notification>
<notification name="MovelockDisabled">
Blocco movimenti inattivo.
</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.

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

@ -4280,6 +4280,12 @@ AO セット "[AO_SET_NAME]" の名前を変更できません。
<notification name="PhantomOff">
ファントム・モードがオフになりました。
</notification>
<notification name="MovelockEnabled">
ムーブメントロックが有効になりました
</notification>
<notification name="MovelockDisabled">
ムーブメントロックが解除されました
</notification>
<!-- Firestorm Phantom -->
<!-- Firestorm Reset Settings -->

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

@ -3933,6 +3933,12 @@ Czy chcesz jej/mu wysłać te informacje?
<notification name="PhantomOff">
Tryb widmowy wyłączony.
</notification>
<notification name="MovelockEnabled">
Blokada pozycji została włączona.
</notification>
<notification name="MovelockDisabled">
Blokada pozycji została wyłączona.
</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.

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

@ -4034,6 +4034,12 @@ URL: [AUDIOURL]
<notification name="PhantomOff">
Фантомный режим выключен.
</notification>
<notification name="MovelockEnabled">
Блокировка движения включена.
</notification>
<notification name="MovelockDisabled">
Блокировка движения выключена.
</notification>
<notification label="Сброс всех настроек" name="FirestormClearSettingsPrompt">
Сброс всех настроек может быть полезен, если вы испытываете проблемы; Однако, вам нужно будет переделывать настройки, которые вы сделали ранее.