summaryrefslogtreecommitdiff
path: root/indra/newview/llvieweraudio.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
committerdolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
commitf684d897f532bcba87cda1f72bd19efac82f6cb6 (patch)
tree6222ff28ee7825e987a127383a081297a80d7e6c /indra/newview/llvieweraudio.cpp
parent4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff)
parent90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff)
Merge with viewer-development
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r--indra/newview/llvieweraudio.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index 8d8c401dac..564bf7997a 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -30,6 +30,7 @@
#include "llagent.h"
#include "llagentcamera.h"
#include "llappviewer.h"
+#include "lldeferredsounds.h"
#include "llvieweraudio.h"
#include "llviewercamera.h"
#include "llviewercontrol.h"
@@ -388,6 +389,12 @@ void audio_update_volume(bool force_update)
gAudiop->setRolloffFactor(gSavedSettings.getF32("AudioLevelRolloff"));
gAudiop->setMuted(mute_audio || progress_view_visible);
+ //Play any deferred sounds when unmuted
+ if(!gAudiop->getMuted())
+ {
+ LLDeferredSounds::instance().playdeferredSounds();
+ }
+
if (force_update)
{
audio_update_wind(true);