diff options
author | McCabe Maxsted | 2009-02-14 05:21:14 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-02-14 05:21:14 -0700 |
commit | 7f858539851bac96f2a20e50f7e94010a015808c (patch) | |
tree | 6672cfc655b3a194a4114c9a911945980db95cc5 /linden/indra/newview/llviewerobject.cpp | |
parent | Fixed crash in LLTextEditor::findHTML (diff) | |
download | meta-impy-7f858539851bac96f2a20e50f7e94010a015808c.zip meta-impy-7f858539851bac96f2a20e50f7e94010a015808c.tar.gz meta-impy-7f858539851bac96f2a20e50f7e94010a015808c.tar.bz2 meta-impy-7f858539851bac96f2a20e50f7e94010a015808c.tar.xz |
Fixed sound settings not being correctly muted
Diffstat (limited to 'linden/indra/newview/llviewerobject.cpp')
-rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index c560ced..cb3afc5 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
@@ -2766,7 +2766,7 @@ BOOL LLViewerObject::updateLOD() | |||
2766 | // Update volume of looping sounds | 2766 | // Update volume of looping sounds |
2767 | if (mAudioSourcep && mAudioSourcep->isLoop()) | 2767 | if (mAudioSourcep && mAudioSourcep->isLoop()) |
2768 | { | 2768 | { |
2769 | F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (mAudioGain * gSavedSettings.getF32("AudioLevelSFX")); | 2769 | F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX"); |
2770 | mAudioSourcep->setGain(volume); | 2770 | mAudioSourcep->setGain(volume); |
2771 | } | 2771 | } |
2772 | return FALSE; | 2772 | return FALSE; |
@@ -4331,7 +4331,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow | |||
4331 | { | 4331 | { |
4332 | BOOL queue = flags & LL_SOUND_FLAG_QUEUE; | 4332 | BOOL queue = flags & LL_SOUND_FLAG_QUEUE; |
4333 | mAudioGain = gain; | 4333 | mAudioGain = gain; |
4334 | F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gain * gSavedSettings.getF32("AudioLevelSFX"); | 4334 | F32 volume = gain * gSavedSettings.getF32("AudioLevelSFX"); |
4335 | mAudioSourcep->setGain(volume); | 4335 | mAudioSourcep->setGain(volume); |
4336 | mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP); | 4336 | mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP); |
4337 | mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER); | 4337 | mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER); |
@@ -4370,7 +4370,7 @@ void LLViewerObject::adjustAudioGain(const F32 gain) | |||
4370 | if (mAudioSourcep) | 4370 | if (mAudioSourcep) |
4371 | { | 4371 | { |
4372 | mAudioGain = gain; | 4372 | mAudioGain = gain; |
4373 | F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : mAudioGain * gSavedSettings.getF32("AudioLevelSFX"); | 4373 | F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX"); |
4374 | mAudioSourcep->setGain(volume); | 4374 | mAudioSourcep->setGain(volume); |
4375 | } | 4375 | } |
4376 | } | 4376 | } |