1 files changed, 27 insertions, 5 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 96fc451..3a3f51b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -62,7 +62,8 @@
 #include "llviewerdisplay.h"
 #include "llviewermedia.h"
 #include "llv4math.h"           // for LL_VECTORIZE
-
+#include "llviewerparcelmedia.h"
+#include "llviewermediafocus.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
 #include "llworldmap.h"
@@ -103,7 +104,8 @@
 #include "llassetstorage.h"
 #include "llpolymesh.h"
 #include "llcachename.h"
-#include "audioengine.h"
+#include "llaudioengine.h"
+#include "llstreamingaudio.h"
 #include "llviewermenu.h"
 #include "llselectmgr.h"
 #include "lltrans.h"
@@ -446,7 +448,7 @@ static void settings_modify()
         LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
         gDebugGL = gSavedSettings.getBOOL("RenderDebugGL");
         gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline");
-        gAuditTexture = gSavedSettings.getBOOL("AuditTexture");
+//      gAuditTexture = gSavedSettings.getBOOL("AuditTexture");
 #if LL_VECTORIZE
         if (gSysCPU.hasAltivec())
         {
@@ -706,8 +708,15 @@ bool LLAppViewer::init()
         LLViewerJointMesh::updateVectorize();
 
         // load MIME type -> media impl mappings
-        LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
-
+        std::string mime_types_name;
+#if LL_DARWIN
+        mime_types_name = "mime_types_mac.xml";
+#elif LL_LINUX
+        mime_types_name = "mime_types_linux.xml";
+#else
+        mime_types_name = "mime_types.xml";
+#endif
+        LLMIMETypes::parseMIMETypes( mime_types_name ); 
 
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();
@@ -1270,6 +1279,14 @@ bool LLAppViewer::cleanup()
 
         if (gAudiop)
         {
+                // shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
+
+                LLStreamingAudioInterface *sai = gAudiop->getStreamingAudioImpl();
+                delete sai;
+                gAudiop->setStreamingAudioImpl(NULL);
+
+                // shut down the audio subsystem
+
                 bool want_longname = false;
                 if (gAudiop->getDriverName(want_longname) == "FMOD")
                 {
@@ -1499,7 +1516,9 @@ bool LLAppViewer::cleanup()
         //Note:
         //LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
         //because some new image might be generated during cleaning up media. --bao
+        LLViewerMediaFocus::cleanupClass();
         LLViewerMedia::cleanupClass();
+        LLViewerParcelMedia::cleanupClass();
         gImageList.shutdown(); // shutdown again in case a callback added something
         LLUIImageList::getInstance()->cleanUp();
         
@@ -3687,6 +3706,9 @@ void LLAppViewer::idle()
                 gAgent.updateCamera();
         }
 
+        // update media focus
+        LLViewerMediaFocus::getInstance()->update();
+
         // objects and camera should be in sync, do LOD calculations now
         {
                 LLFastTimer t(LLFastTimer::FTM_LOD_UPDATE);