Second Life viewer sources 1.19.1.2

3 files changed, 11 insertions, 35 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index b54d088..8b0363a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -185,11 +185,15 @@ startup ( LLMediaManagerData* init_data )
                 else
                         WARNMSG("gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart.");
 
+                // Protect against GStreamer resetting the locale, yuck.
+                std::string saved_locale = setlocale(LC_ALL, NULL);
                 if (0 == llgst_init_check(NULL, NULL, NULL))
                 {
                         WARNMSG("GST init failed for unspecified reason.");
+                        setlocale(LC_ALL, saved_locale.c_str() );
                         return false;
                 }
+                setlocale(LC_ALL, saved_locale.c_str() );
                 
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
index bba3ef5..c5e3c7b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
@@ -124,7 +124,7 @@ bool grab_gst_syms(std::string gst_dso_name,
         }
         else
         {
-                INFOMSG("Couldn't load DSO: ", gst_dso_name.c_str());
+                INFOMSG("Couldn't load DSO: %s", gst_dso_name.c_str());
                 rtn = false; // failure
         }
 
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 87d9c77..5efaa59 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -47,7 +47,10 @@
         // Linux, MESA headers, but not necessarily assuming MESA runtime.
         // quotes so we get libraries/.../GL/ version
         #include "GL/gl.h"
-        #include <locale.h>
+#endif
+
+#if LL_LINUX
+ #include <locale.h>
 #endif
 
 #include <iostream>
@@ -59,7 +62,8 @@ static LLMediaImplRegister sLLMediaImplLLMozLibReg( "LLMediaImplLLMozLib", new L
 //
 LLMediaImplLLMozLibMaker::LLMediaImplLLMozLibMaker()
 {
-        // Register to handle the scheme
+        // Register to handle the mime category
+        mMimeTypes.push_back( "image/svg+xml" );
         mMimeTypeCategories.push_back( "text" );
 #if !LL_QUICKTIME_ENABLED
         mMimeTypeCategories.push_back( "image" );
@@ -198,17 +202,9 @@ bool LLMediaImplLLMozLib::setCaretColor( unsigned int red, unsigned int green, u
 // virtual
 bool LLMediaImplLLMozLib::navigateTo( const std::string url )
 {
-#if LL_LINUX
-        std::string saved_locale = setlocale(LC_ALL, NULL);
-#endif // LL_LINUX
-
         // pass url to llmozlib
         LLMozLib::getInstance()->navigateTo( mWindowId, url );
 
-#if LL_LINUX
-        setlocale(LC_ALL, saved_locale.c_str() );
-#endif // LL_LINUX
-
         // emit event with size change to kick things off
         LLMediaEvent event( this );
         mEventEmitter.update( &LLMediaObserver::onMediaSizeChange, event );
@@ -264,10 +260,6 @@ bool LLMediaImplLLMozLib::updateState()
                 clearCommand();
         };
 
-#if LL_LINUX
-        std::string saved_locale = setlocale(LC_ALL, NULL);
-#endif // LL_LINUX
-
         if ( nextCommand() == LLMediaBase::COMMAND_BACK  )
         {
                 setStatus( LLMediaBase::STATUS_STARTED );
@@ -282,10 +274,6 @@ bool LLMediaImplLLMozLib::updateState()
                 clearCommand();
         };
 
-#if LL_LINUX
-        setlocale(LC_ALL, saved_locale.c_str() );
-#endif // LL_LINUX
-
         return true;
 }
 
@@ -382,16 +370,8 @@ bool LLMediaImplLLMozLib::recomputeSizes()
                 new_height = LLMediaManager::textureHeightFromMediaHeight( new_height );
         }
 
-#if LL_LINUX
-        std::string saved_locale = setlocale(LC_ALL, NULL);
-#endif // LL_LINUX
-
         bool status = LLMozLib::getInstance()->setSize( mWindowId, new_width, new_height );
 
-#if LL_LINUX
-        setlocale(LC_ALL, saved_locale.c_str() );
-#endif // LL_LINUX
-
         if (status)
                 setMediaSize(new_width, new_height);
 
@@ -623,20 +603,12 @@ bool LLMediaImplLLMozLib::clearCookies()
 // virtual
 bool LLMediaImplLLMozLib::reset()
 {
-#if LL_LINUX
-        std::string saved_locale = setlocale(LC_ALL, NULL);
-#endif // LL_LINUX
-
         LLMozLib::getInstance()->remObserver( mWindowId, this );
 
         LLMozLib::getInstance()->destroyBrowserWindow( mWindowId );
 
         mWindowId = 0;
 
-#if LL_LINUX
-        setlocale(LC_ALL, saved_locale.c_str() );
-#endif // LL_LINUX
-
         return true;
 }