1 files changed, 23 insertions, 12 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b70253e..a03ce1d 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -39,15 +39,16 @@
 #else
 #       include <sys/stat.h>            // mkdir()
 #endif
-
-#include "audioengine.h"
+#include "llpluginclassmediaowner.h"
+#include "llviewermedia_streamingaudio.h"
+#include "llaudioengine.h"
 
 #ifdef LL_FMOD
-# include "audioengine_fmod.h"
+# include "llaudioengine_fmod.h"
 #endif
 
 #ifdef LL_OPENAL
-#include "audioengine_openal.h"
+#include "llaudioengine_openal.h"
 #endif
 
 #include "llares.h"
@@ -100,6 +101,7 @@
 #include "llfloatergesture.h"
 #include "llfloaterhud.h"
 #include "llfloaterland.h"
+#include "llfloaterteleporthistory.h"
 #include "llfloatertopobjects.h"
 #include "llfloatertos.h"
 #include "llfloaterworldmap.h"
@@ -679,6 +681,16 @@ bool idle_startup()
                                         delete gAudiop;
                                         gAudiop = NULL;
                                 }
+
+                                if (gAudiop)
+                                {
+                                        // if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins
+                                        if (NULL == gAudiop->getStreamingAudioImpl())
+                                        {
+                                                LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
+                                                gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
+                        }
+                }
                         }
                 }
                 
@@ -764,7 +776,7 @@ bool idle_startup()
                 std::string msg = LLTrans::getString("LoginInitializingBrowser");
                 set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
                 display_startup();
-                LLViewerMedia::initBrowser();
+                // LLViewerMedia::initBrowser();
 
                 LLStartUp::setStartupState( STATE_LOGIN_SHOW );
                 return FALSE;
@@ -2240,6 +2252,8 @@ bool idle_startup()
                         LLStringUtil::truncate(gWindowTitle, 255);
                         gViewerWindow->getWindow()->setWindowTitle(gWindowTitle);
                 }
+                // Inform simulator of our language preference
+                LLAgentLanguage::update();
 
                 // unpack thin inventory
                 LLUserAuth::options_t options;
@@ -2559,9 +2573,6 @@ bool idle_startup()
                 // JC - 7/20/2002
                 gViewerWindow->sendShapeToSim();
 
-                // Inform simulator of our language preference
-                LLAgentLanguage::update();
-
                 
                 // Ignore stipend information for now.  Money history is on the web site.
                 // if needed, show the L$ history window
@@ -3724,7 +3735,7 @@ void init_start_screen(S32 location_id)
         }
 
         raw->expandToPowerOfTwo();
-        gStartImageGL->createGLTexture(0, raw, 0, TRUE, LLViewerImageBoostLevel::OTHER);
+        gStartImageGL->createGLTexture(0, raw);
 }
 
 
@@ -3830,7 +3841,7 @@ void LLStartUp::multimediaInit()
         set_startup_status(0.42f, msg.c_str(), gAgent.mMOTD.c_str());
         display_startup();
 
-        LLViewerMedia::initClass();
+        //LLViewerMedia::initClass();
         LLViewerParcelMedia::initClass();
 }
 
@@ -3839,7 +3850,7 @@ bool LLStartUp::dispatchURL()
         // ok, if we've gotten this far and have a startup URL
         if (!sSLURLCommand.empty())
         {
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = false;
                 LLURLDispatcher::dispatch(sSLURLCommand, web, trusted_browser);
         }
@@ -3857,7 +3868,7 @@ bool LLStartUp::dispatchURL()
                         || (dy*dy > SLOP*SLOP) )
                 {
                         std::string url = LLURLSimString::getURL();
-                        LLWebBrowserCtrl* web = NULL;
+                        LLMediaCtrl* web = NULL;
                         const bool trusted_browser = false;
                         LLURLDispatcher::dispatch(url, web, trusted_browser);
                 }