diff options
| author | simon <none@none> | 2014-03-26 10:04:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:04:53 -0700 |
| commit | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (patch) | |
| tree | 5dfdbcede0d8c689e796cf65ebc21bb149c17b8e /indra/newview/llviewerobject.cpp | |
| parent | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (diff) | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
Pull in downstream -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index e62998db70..c789719291 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4950,6 +4950,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow { if (!gAudiop) { + LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL; return; } @@ -5032,7 +5033,10 @@ LLAudioSource *LLViewerObject::getAudioSource(const LLUUID& owner_id) LLAudioSourceVO *asvop = new LLAudioSourceVO(mID, owner_id, 0.01f, this); mAudioSourcep = asvop; - if(gAudiop) gAudiop->addAudioSource(asvop); + if(gAudiop) + { + gAudiop->addAudioSource(asvop); + } } return mAudioSourcep; @@ -5040,10 +5044,6 @@ LLAudioSource *LLViewerObject::getAudioSource(const LLUUID& owner_id) void LLViewerObject::adjustAudioGain(const F32 gain) { - if (!gAudiop) - { - return; - } if (mAudioSourcep) { mAudioGain = gain; |