summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
committerOz Linden <oz@lindenlab.com>2014-03-14 16:38:12 -0400
commitd6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch)
tree8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llaudio
parentbc7a579ba285fa64876a2bc116685f0357fe25dc (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llaudio')
-rw-r--r--indra/llaudio/lllistener_fmodex.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llaudio/lllistener_fmodex.cpp b/indra/llaudio/lllistener_fmodex.cpp
index 2509a7aebc..31ab47a635 100644
--- a/indra/llaudio/lllistener_fmodex.cpp
+++ b/indra/llaudio/lllistener_fmodex.cpp
@@ -94,6 +94,11 @@ void LLListener_FMODEX::orient(LLVector3 up, LLVector3 at)
//-----------------------------------------------------------------------
void LLListener_FMODEX::commitDeferredChanges()
{
+ if(!mSystem)
+ {
+ return;
+ }
+
mSystem->update();
}