Second Life viewer sources 1.21.0-RC

1 files changed, 18 insertions, 5 deletions

diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 8d637c0..f72e63c 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -36,10 +36,13 @@
 #include "llmediaimplexample2.h"
 #include "llmediaimplquicktime.h"
 #include "llmediaimplgstreamer.h"
-#include "llmediaimplllmozlib.h"
+#if LL_LLMOZLIB_ENABLED
+# include "llmediaimplllmozlib.h"
+#endif
 
 LLMediaManager* LLMediaManager::sInstance = 0;
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // (private)
 LLMediaManager::LLMediaManager()
@@ -52,6 +55,20 @@ LLMediaManager::~LLMediaManager()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// Early initialization for web browser for the viewer, so we can show
+// the login screen and defer initialization of QuickTime, etc. JC
+// (static)
+void LLMediaManager::initBrowser( LLMediaManagerData* init_data )
+{
+        if ( ! sInstance )
+                sInstance = new LLMediaManager();
+
+#if LL_LLMOZLIB_ENABLED
+        LLMediaImplLLMozLib::startup( init_data );
+#endif // LL_LLMOZLIB_ENABLED
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // (static)
 void LLMediaManager::initClass( LLMediaManagerData* init_data )
 {
@@ -73,10 +90,6 @@ void LLMediaManager::initClass( LLMediaManagerData* init_data )
 #if LL_GSTREAMER_ENABLED
         LLMediaImplGStreamer::startup( init_data );
 #endif // LL_GSTREAMER_ENABLED
-
-#if LL_LLMOZLIB_ENABLED
-        LLMediaImplLLMozLib::startup( init_data );
-#endif // LL_LLMOZLIB_ENABLED
 }
 
 ////////////////////////////////////////////////////////////////////////////////