diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 | ||||
| -rw-r--r-- | indra/newview/llvieweraudio.cpp | 7 |
2 files changed, 5 insertions, 24 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c7300cc1bb..3c53a9d44c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -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> diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 0262da4dee..1e5c742cf9 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -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); |