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

STORM-591 Remove 2 development debug settings and replace them with constants

meow-7.2.2
Jonathan Yap 2011-11-22 13:13:51 -05:00
parent ed596077c4
commit 2b43a6b8c9
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,28 +192,6 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>AudioMusicFadeIn</key>
<map>
<key>Comment</key>
<string>Fade in time in seconds for music streams</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>5.0</real>
</map>
<key>AudioMusicFadeOut</key>
<map>
<key>Comment</key>
<string>Fade out time in seconds for music streams</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>5.0</real>
</map>
<key>AudioLevelAmbient</key>
<map>
<key>Comment</key>

7
indra/newview/llvieweraudio.cpp
View File

@ -174,14 +174,17 @@ void LLViewerAudio::stopInternetStreamWithAutoFade()
void LLViewerAudio::startFading()
{
const F32 AUDIO_MUSIC_FADE_IN_TIME = 3.0;
const F32 AUDIO_MUSIC_FADE_OUT_TIME = 2.0;
if(mDone)
{
// The fade state here should only be one of FADE_IN or FADE_OUT, but, in case it is not,
// rather than check for both states assume a fade in and check for the fade out case.
mFadeTime = llmax(0.0f, gSavedSettings.getF32("AudioMusicFadeIn"));
mFadeTime = AUDIO_MUSIC_FADE_IN_TIME;
if (LLViewerAudio::getInstance()->getFadeState() == LLViewerAudio::FADE_OUT)
{
mFadeTime = llmax(0.0f, gSavedSettings.getF32("AudioMusicFadeOut"));
mFadeTime = AUDIO_MUSIC_FADE_OUT_TIME;
}
stream_fade_timer.reset();
stream_fade_timer.setTimerExpirySec(mFadeTime);