From cec5419d5d072a326e7a6303aa3cb8ee3d6f5b80 Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Sat, 18 Oct 2025 02:13:22 -0400
Subject: Add debug option to force libvlc plugin on linux

Signed-off-by: Rye <rye@alchemyviewer.org>
---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llviewermedia.cpp         |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a7a52182c1..94c7a97ccc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5064,6 +5064,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>MediaPluginForceVLC</key>
+  <map>
+    <key>Comment</key>
+    <string>Force use of VLC based media plugin. (Linux Only)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>MediaControlFadeTime</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index bb3ea74589..a75f2b2c64 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1735,6 +1735,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
     }
     else
     {
+#if LL_LINUX
+        if(plugin_basename == "media_plugin_gstreamer10" && gSavedSettings.getBOOL("MediaPluginForceVLC"))
+        {
+            plugin_basename = "media_plugin_libvlc";
+        }
+#endif
+
         std::string launcher_name = gDirUtilp->getLLPluginLauncher();
         std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename);
 
-- 
cgit v1.3