summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 4c6f27944f..9243263794 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2717,7 +2717,7 @@ BOOL LLViewerObject::updateLOD()
// Update volume of looping sounds
if (mAudioSourcep && mAudioSourcep->isLoop())
{
- F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
+ F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (mAudioGain * gSavedSettings.getF32("AudioLevelSFX"));
mAudioSourcep->setGain(volume);
}
return FALSE;
@@ -4228,7 +4228,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
{
BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
mAudioGain = gain;
- F32 volume = gain * gSavedSettings.getF32("AudioLevelSFX");
+ F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gain * gSavedSettings.getF32("AudioLevelSFX");
mAudioSourcep->setGain(volume);
mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
@@ -4267,7 +4267,7 @@ void LLViewerObject::adjustAudioGain(const F32 gain)
if (mAudioSourcep)
{
mAudioGain = gain;
- F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
+ F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
mAudioSourcep->setGain(volume);
}
}