2 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 021c940..05636c1 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -1621,6 +1621,8 @@ LLAudioData::LLAudioData(const LLUUID &uuid) :
                 // This is a null sound.
                 return;
         }
+        llassert_always(gAudiop) ;
+        llassert_always(gAssetStorage) ;
 
         if (gAudiop->hasDecodedFile(uuid))
         {
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 271074e..cc2042d 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -538,7 +538,7 @@ void LLAudioChannelFMOD::update3DPosition()
                 float_pos.setVec(mCurrentSourcep->getPositionGlobal());
                 if (!FSOUND_3D_SetAttributes(mChannelID, float_pos.mV, mCurrentSourcep->getVelocity().mV))
                 {
-                        llwarns << "LLAudioChannelFMOD::update3DPosition error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+                        LL_DEBUGS("FMOD") << "LLAudioChannelFMOD::update3DPosition error: " << FMOD_ErrorString(FSOUND_GetError()) << LL_ENDL;
                 }
         }
 }
@@ -576,7 +576,7 @@ void LLAudioChannelFMOD::cleanup()
         //llinfos << "Cleaning up channel: " << mChannelID << llendl;
         if (!FSOUND_StopSound(mChannelID))
         {
-                llwarns << "LLAudioChannelFMOD::cleanup error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
+                LL_DEBUGS("FMOD") << "LLAudioChannelFMOD::cleanup error: " << FMOD_ErrorString(FSOUND_GetError()) << llendl;
         }
 
         mCurrentBufferp = NULL;