set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="".

This prevents GStreamer from looking for system-installed plugins,
which can have conflicts with our packaged ones.

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0bdc570..d4cf20d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,12 @@
 2009-03-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        set_gst_plugin_path now sets GST_PLUGIN_SYSTEM_PATH="".
+        This prevents GStreamer from looking for system-installed plugins,
+        which can have conflicts with our packaged ones.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
         Improved set_gst_plugin_path, now sets path on Mac too.
 
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 20b89f5..270b08b 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -282,6 +282,9 @@ void LLMediaImplGStreamer::set_gst_plugin_path()
         LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to "
                                << getenv("GST_PLUGIN_PATH") << LL_ENDL;
 
+        // Disable loading system plugins. We only want to use ours, to avoid conflicts.
+        putenv( "GST_PLUGIN_SYSTEM_PATH=\"\"" );
+
 #endif // LL_WINDOWS || LL_DARWIN
 }