summaryrefslogtreecommitdiff
path: root/indra/newview/lldeferredsounds.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-19 18:10:45 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-19 18:10:45 -0400
commit67051b26ba41a0d0cde2c2b96bccb0972d8ffe23 (patch)
tree4856017a193dd7a559bb3021670877f2eab5d155 /indra/newview/lldeferredsounds.cpp
parenta5bb8839fa24fa0b7da331f14eedccea1b44bc84 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
merge
Diffstat (limited to 'indra/newview/lldeferredsounds.cpp')
-rwxr-xr-xindra/newview/lldeferredsounds.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lldeferredsounds.cpp b/indra/newview/lldeferredsounds.cpp
index 9416e7cd29..e1613e4719 100755
--- a/indra/newview/lldeferredsounds.cpp
+++ b/indra/newview/lldeferredsounds.cpp
@@ -39,7 +39,10 @@ void LLDeferredSounds::playdeferredSounds()
{
while(soundVector.size())
{
- gAudiop->triggerSound(soundVector.back());
+ if (gAudiop)
+ {
+ gAudiop->triggerSound(soundVector.back());
+ }
soundVector.pop_back();
}
}