summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 6448dd6ba5..b491701a36 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1826,7 +1826,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
if (plugin_basename == "media_plugin_cef")
{
launcher_name = "/compat/linux/usr/libexec/megapahit/SLPlugin";
- plugin_name = "/compat/linux/usr/lib/x86_64-linux-gnu/libmedia_plugin_cef.so";
+ plugin_name = "/compat/linux/usr/lib/x86_64-linux-gnu/megapahit/libmedia_plugin_cef.so";
}
#endif
@@ -1873,7 +1873,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging");
media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled || clean_browser);
-#if LL_LINUX
+#if LL_LINUX || __FreeBSD__
bool media_plugin_pipewire_volume_catcher = gSavedSettings.getBOOL("MediaPluginPipeWireVolumeCatcher");
media_source->enablePipeWireVolumeCatcher( media_plugin_pipewire_volume_catcher );
#endif
@@ -1891,8 +1891,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string plugin_dir = gDirUtilp->getLLPluginDir();
if (plugin_basename == "media_plugin_cef")
{
- plugin_dir = "/compat/linux/usr/lib/x86_64-linux-gnu";
- plugin_name = "/usr/lib/x86_64-linux-gnu/libmedia_plugin_cef.so";
+ plugin_dir = "/compat/linux/usr/lib/x86_64-linux-gnu/megapahit";
+ plugin_name = "/usr/lib/x86_64-linux-gnu/megapahit/libmedia_plugin_cef.so";
}
#else
const std::string plugin_dir = gDirUtilp->getLLPluginDir();