aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvieweraudio.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:23 -0500
committerJacek Antonelli2008-08-15 23:45:23 -0500
commit486c4774ab4a707d69c1b48cdc048af1369084db (patch)
tree2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/newview/llvieweraudio.cpp
parentSecond Life viewer sources 1.18.6.1-RC (diff)
downloadmeta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/newview/llvieweraudio.cpp')
-rw-r--r--linden/indra/newview/llvieweraudio.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index fc11915..5a60c98 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -21,15 +21,16 @@
21 21
22#include "llviewerprecompiledheaders.h" 22#include "llviewerprecompiledheaders.h"
23 23
24#include "llvieweraudio.h"
25#include "audioengine.h" 24#include "audioengine.h"
26#include "llviewercontrol.h" 25#include "audiosettings.h"
27#include "llmediaengine.h"
28#include "llagent.h" 26#include "llagent.h"
29#include "llappviewer.h" 27#include "llappviewer.h"
30#include "llvoiceclient.h" 28#include "llmediaengine.h"
31#include "llviewerwindow.h" 29#include "llvieweraudio.h"
32#include "llviewercamera.h" 30#include "llviewercamera.h"
31#include "llviewercontrol.h"
32#include "llviewerwindow.h"
33#include "llvoiceclient.h"
33 34
34///////////////////////////////////////////////////////// 35/////////////////////////////////////////////////////////
35 36
@@ -219,7 +220,8 @@ void audio_update_wind(bool force_update)
219 // don't use the setter setMaxWindGain() because we don't 220 // don't use the setter setMaxWindGain() because we don't
220 // want to screw up the fade-in on startup by setting actual source gain 221 // want to screw up the fade-in on startup by setting actual source gain
221 // outside the fade-in. 222 // outside the fade-in.
222 gAudiop->mMaxWindGain = gSavedSettings.getF32("AudioLevelAmbient"); 223 F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
224 gAudiop->mMaxWindGain = ambient_volume * ambient_volume;
223 225
224 last_camera_water_height = camera_water_height; 226 last_camera_water_height = camera_water_height;
225 gAudiop->updateWind(gRelativeWindVec, camera_water_height); 227 gAudiop->updateWind(gRelativeWindVec, camera_water_height);