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

STORM-1980 Center floater on screen. Tweak shaking parameters.

meow-7.2.2
Jonathan Yap 2014-01-04 10:40:20 -05:00
parent 05a313f546
commit 24c5ac7417
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloaterregionrestarting.cpp
View File

@ -100,9 +100,10 @@ void LLFloaterRegionRestarting::draw()
{
LLFloater::draw();
const F32 SHAKE_INTERVAL = 0.04;
const F32 SHAKE_INTERVAL = 0.025;
const F32 SHAKE_TOTAL_DURATION = 1.8; // the length of the default alert tone for this
const F32 SHAKE_INITIAL_MAGNITUDE = 1.5;
const F32 SHAKE_HORIZONTAL_BIAS = 0.25;
F32 time_shaking;
if(SHAKE_START == sShakeState)
@ -120,7 +121,7 @@ void LLFloaterRegionRestarting::draw()
switch(sShakeState)
{
case SHAKE_LEFT:
gAgentCamera.setPanLeftKey(mShakeMagnitude);
gAgentCamera.setPanLeftKey(mShakeMagnitude * SHAKE_HORIZONTAL_BIAS);
sShakeState = SHAKE_UP;
break;
@ -130,7 +131,7 @@ void LLFloaterRegionRestarting::draw()
break;
case SHAKE_RIGHT:
gAgentCamera.setPanRightKey(mShakeMagnitude);
gAgentCamera.setPanRightKey(mShakeMagnitude * SHAKE_HORIZONTAL_BIAS);
sShakeState = SHAKE_DOWN;
break;

6
indra/newview/llviewermessage.cpp
View File

@ -5978,7 +5978,11 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
LLSD params;
params["NAME"] = llsdBlock["NAME"];
params["SECONDS"] = (LLSD::Integer)seconds;
LLFloaterReg::showInstance("region_restarting", params);
LLFloaterRegionRestarting* restarting_floater = dynamic_cast<LLFloaterRegionRestarting*>(LLFloaterReg::showInstance("region_restarting", params));
if(restarting_floater)
{
restarting_floater->center();
}
}
send_sound_trigger(LLUUID(gSavedSettings.getString("UISndRestart")), 1.0f);