diff options
| author | Jacek Antonelli | 2008-12-06 14:03:10 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-06 14:03:10 -0600 |
| commit | b29b13ad98c5c79fd63bae10b4b099a03fa9dc35 (patch) | |
| tree | ffc14fd638344c84287d1c4a72d2de5f765bf3c8 /linden/indra/newview/llviewermessage.cpp | |
| parent | openal on windows branch (diff) | |
| download | meta-impy-b29b13ad98c5c79fd63bae10b4b099a03fa9dc35.zip meta-impy-b29b13ad98c5c79fd63bae10b4b099a03fa9dc35.tar.gz meta-impy-b29b13ad98c5c79fd63bae10b4b099a03fa9dc35.tar.bz2 meta-impy-b29b13ad98c5c79fd63bae10b4b099a03fa9dc35.tar.xz | |
Updated audio engine to LL's openal branch r1532.
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
| -rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index 0e39026..260265e 100644 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
| @@ -3308,8 +3308,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **) | |||
| 3308 | return; | 3308 | return; |
| 3309 | } | 3309 | } |
| 3310 | 3310 | ||
| 3311 | F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (gain * gSavedSettings.getF32("AudioLevelSFX")); | 3311 | gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global); |
| 3312 | gAudiop->triggerSound(sound_id, owner_id, volume, pos_global); | ||
| 3313 | } | 3312 | } |
| 3314 | 3313 | ||
| 3315 | void process_preload_sound(LLMessageSystem *msg, void **user_data) | 3314 | void process_preload_sound(LLMessageSystem *msg, void **user_data) |