summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorsimon <none@none>2014-03-11 10:41:52 -0700
committersimon <none@none>2014-03-11 10:41:52 -0700
commitc7aad1f7e3f643706d714b4426070174abc95145 (patch)
treeaefbe573a6bf0deb3278840b3078ebd3368ef63a /indra/llaudio
parent8b28593c107145af24f860b3f8d55568987ac6c0 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge downstream code to 3.7.4
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();
}