diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
| commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
| tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/llaudio/llaudioengine_fmodex.cpp | |
| parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
| parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) | |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'indra/llaudio/llaudioengine_fmodex.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmodex.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp index 5ec30c7d1d..c2c3648ae8 100644 --- a/indra/llaudio/llaudioengine_fmodex.cpp +++ b/indra/llaudio/llaudioengine_fmodex.cpp @@ -305,8 +305,11 @@ void LLAudioEngine_FMODEX::shutdown() LLAudioEngine::shutdown(); llinfos << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl; + if ( mSystem ) // speculative fix for MAINT-2657 + { mSystem->close(); mSystem->release(); + } llinfos << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl; delete mListenerp; |