diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /indra/newview/llvieweraudio.cpp | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
| -rw-r--r-- | indra/newview/llvieweraudio.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 0d250d97f6..021591bd5b 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -238,10 +238,12 @@ void audio_update_wind(bool force_update) // don't use the setter setMaxWindGain() because we don't // want to screw up the fade-in on startup by setting actual source gain // outside the fade-in. - F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient"); - gAudiop->mMaxWindGain = gSavedSettings.getBOOL("MuteAmbient") - ? 0.f - : ambient_volume * ambient_volume; + F32 master_volume = gSavedSettings.getBOOL("MuteAudio") ? 0.f : gSavedSettings.getF32("AudioLevelMaster"); + F32 ambient_volume = gSavedSettings.getBOOL("MuteAmbient") ? 0.f : gSavedSettings.getF32("AudioLevelAmbient"); + + F32 wind_volume = master_volume * ambient_volume; + gAudiop->mMaxWindGain = wind_volume; + last_camera_water_height = camera_water_height; gAudiop->updateWind(gRelativeWindVec, camera_water_height); |