From b1412201b6e44c1a304acd70d9104d3a2034da52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 29 Mar 2009 22:28:41 -0500
Subject: 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 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'linden')

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
 }
 
-- 
cgit v1.1