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

EXT-7335 WIP Changed VoiceEffectExpiryWarningTime from F32 to S32

meow-7.2.2
Aimee Linden 2010-05-24 10:55:41 +01:00
parent 40e240fe61
commit 55c935ea76
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@ -10591,9 +10591,9 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<string>S32</string>
<key>Value</key>
<real>259200.0</real>
<integer>259200</integer>
</map>
<key>VoiceMorphingEnabled</key>
<map>

10
indra/newview/llvoicevivox.cpp
View File

@ -6597,11 +6597,11 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
font->mExpiryTimer.setTimerExpirySec(expiry_time);
// Set the warning timer to some interval before actual expiry.
F64 warning_time = (F64)gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
if (warning_time > 0.f)
S32 warning_time = gSavedSettings.getS32("VoiceEffectExpiryWarningTime");
if (warning_time > 0)
{
font->mExpiryWarningTimer.start();
expiry_time = (expiration_date.secondsSinceEpoch() - warning_time)
expiry_time = (expiration_date.secondsSinceEpoch() - (F64)warning_time)
- LLTimer::getTotalSeconds();
font->mExpiryWarningTimer.setTimerExpirySec(expiry_time);
}
@ -6704,8 +6704,8 @@ void LLVivoxVoiceClient::expireVoiceFonts()
// Give a warning notification if any voice fonts are due to expire.
if (will_expire)
{
S32 seconds = gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
args["INTERVAL"] = llformat("%d", (seconds / SEC_PER_DAY));
S32 seconds = gSavedSettings.getS32("VoiceEffectExpiryWarningTime");
args["INTERVAL"] = llformat("%d", seconds / SEC_PER_DAY);
LLNotificationsUtil::add("VoiceEffectsWillExpire", args);
}