FIRE-12900, FIRE-12901: Make screen shaking optional on region restart

meow-7.2.2
Northspring 2014-02-12 18:51:21 +01:00
parent d26f1bb881
commit ae26e26fcf
4 changed files with 29 additions and 0 deletions

View File

@ -21941,6 +21941,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>2</integer>
</map>
<key>FSNoScreenShakeOnRegionRestart</key>
<map>
<key>Comment</key>
<string>Don't shake my screen when region restart alert message is shown</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

View File

@ -32,6 +32,7 @@
#include "lluictrl.h"
#include "llagent.h"
#include "llagentcamera.h"
#include "llviewercontrol.h" // <FS:PP> FIRE-12900, FIRE-12901: gSavedSettings, make screen shaking optional
#include "llviewerwindow.h"
static S32 sSeconds;
@ -100,6 +101,13 @@ void LLFloaterRegionRestarting::draw()
{
LLFloater::draw();
// <FS:PP> FIRE-12900, FIRE-12901: Make screen shaking optional
if (gSavedSettings.getBOOL("FSNoScreenShakeOnRegionRestart"))
{
return;
}
// </FS:PP>
double SHAKE_INTERVAL = 0.025;
double SHAKE_TOTAL_DURATION = 1.8; // the length of the default alert tone for this
const F32 SHAKE_INITIAL_MAGNITUDE = 1.5;

View File

@ -847,6 +847,15 @@
left="10"
name="FSShowToastsInFront"
top_pad="10"
width="256" />
<check_box
control_name="FSNoScreenShakeOnRegionRestart"
height="16"
label="Don't shake my screen when region restart alert message is shown"
layout="topleft"
left="10"
name="FSNoScreenShakeOnRegionRestart"
top_pad="5"
width="256" />
</panel>

View File

@ -120,6 +120,7 @@
</text>
<slider label="Szerokość tosta czatu:" tool_tip="Szerokość tosta czatu lokalnego ustalana procentowo do szerokości ekranu" name="NearbyToastWidth" />
<check_box label="Pokazuj tosty ponad innymi oknami" name="FSShowToastsInFront" />
<check_box label="Nie trzęś moim ekranem, gdy pojawia się informacja o restarcie regionu" name="FSNoScreenShakeOnRegionRestart" />
</panel>
<panel label="Czcionka" name="UI-font-tab">
<text name="tooltip_textbox1">