diff options
author | Richard Nelson <none@none> | 2010-04-27 09:41:33 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-04-27 09:41:33 -0700 |
commit | bd08f1989461b8b81ed04df6f8dc2097862a20e8 (patch) | |
tree | 491873fa21a9da11d812e4e98410890407ce289e /indra/newview/llvieweraudio.cpp | |
parent | 3a7490e492b35d5dc55f6124d2e1acbca3bd4d79 (diff) |
EXT-6921 - Windows Xp/Vista unified volume control
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r-- | indra/newview/llvieweraudio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 2661c9f32b..9559311e3c 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -145,7 +145,7 @@ void audio_update_volume(bool force_update) { F32 music_volume = gSavedSettings.getF32("AudioLevelMusic"); BOOL music_muted = gSavedSettings.getBOOL("MuteMusic"); - music_volume = mute_volume * master_volume * (music_volume*music_volume); + music_volume = mute_volume * master_volume * music_volume; gAudiop->setInternetStreamGain ( music_muted ? 0.f : music_volume ); } @@ -153,7 +153,7 @@ void audio_update_volume(bool force_update) // Streaming Media F32 media_volume = gSavedSettings.getF32("AudioLevelMedia"); BOOL media_muted = gSavedSettings.getBOOL("MuteMedia"); - media_volume = mute_volume * master_volume * (media_volume*media_volume); + media_volume = mute_volume * master_volume * media_volume; LLViewerMedia::setVolume( media_muted ? 0.0f : media_volume ); // Voice |