diff options
author | McCabe Maxsted | 2009-03-07 10:39:53 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-03-07 10:39:53 -0700 |
commit | 35f1a85fe1c7f18256f305f68c8b1e46f7b8696d (patch) | |
tree | 0781bfaa16ef564012919b10713436cf4dd42b7b /linden/indra/llaudio/audioengine.cpp | |
parent | Backported fix for VWR-4070 from 1.22 (diff) | |
download | meta-impy-35f1a85fe1c7f18256f305f68c8b1e46f7b8696d.zip meta-impy-35f1a85fe1c7f18256f305f68c8b1e46f7b8696d.tar.gz meta-impy-35f1a85fe1c7f18256f305f68c8b1e46f7b8696d.tar.bz2 meta-impy-35f1a85fe1c7f18256f305f68c8b1e46f7b8696d.tar.xz |
Applied patch by Zwagoth Klaar for muting sounds before decoding
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llaudio/audioengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp index 7bb65e9..75901e8 100644 --- a/linden/indra/llaudio/audioengine.cpp +++ b/linden/indra/llaudio/audioengine.cpp | |||
@@ -879,7 +879,8 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i | |||
879 | // Create a new source (since this can't be associated with an existing source. | 879 | // Create a new source (since this can't be associated with an existing source. |
880 | //LL_INFOS("AudioEngine") << "Localized: " << audio_uuid << llendl; | 880 | //LL_INFOS("AudioEngine") << "Localized: " << audio_uuid << llendl; |
881 | 881 | ||
882 | if (mMuted) | 882 | //If we cannot hear it, dont even try to load the sound. |
883 | if (mMuted || gain == 0.0) | ||
883 | { | 884 | { |
884 | return; | 885 | return; |
885 | } | 886 | } |