Second Life viewer sources 1.22.0-RC

3 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 8ef8006..0c892f9 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -11,6 +11,7 @@ include(LLMedia)
 include(LLMessage)
 include(LLWindow)
 include(Mozlib)
+include(QuickTime)
 
 include_directories(
     ${GSTREAMER_INCLUDE_DIRS}
@@ -92,3 +93,9 @@ set_source_files_properties(${llmedia_HEADER_FILES}
 list(APPEND llmedia_SOURCE_FILES ${llmedia_HEADER_FILES})
 
 add_library (llmedia ${llmedia_SOURCE_FILES})
+target_link_libraries(
+    llmedia
+    ${GSTREAMER_LIBRARIES}
+    ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${QUICKTIME_LIBRARY}
+    )
diff --git a/linden/indra/llmedia/llmediaimplexample2.cpp b/linden/indra/llmedia/llmediaimplexample2.cpp
index 13036f9..dc19f55 100644
--- a/linden/indra/llmedia/llmediaimplexample2.cpp
+++ b/linden/indra/llmedia/llmediaimplexample2.cpp
@@ -45,7 +45,7 @@ static LLMediaImplRegister sLLMediaImplExample2Reg( "LLMediaImplExample2", new L
 LLMediaImplExample2Maker::LLMediaImplExample2Maker()
 {
         // Register to handle the scheme
-        mSchema.push_back( "example2" );
+        mSchema.push_back( "example2." );
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..b1d36f0 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -171,6 +171,9 @@ startup ( LLMediaManagerData* init_data )
         static bool done_init = false;
         if (!done_init)
         {
+                // Init the glib type system - we need it.
+                g_type_init();
+
                 // Get symbols!
                 if (! grab_gst_syms("libgstreamer-0.10.so.0",
                                     "libgstvideo-0.10.so.0",