summaryrefslogtreecommitdiff
path: root/indra/newview/lldeferredsounds.cpp
diff options
context:
space:
mode:
authorStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
committerStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
commitbabd89b77050ab49166f2fbd6d460884070140d9 (patch)
treedd3039e009f3e0f7ca2de578f4599e79ca15a1dc /indra/newview/lldeferredsounds.cpp
parent08e83a341e76de8fa4d8c4a974edbe3e0bd1c128 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
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();
}
}