Merge branch 'release/maint-b' into marchcat/b-develop

# Conflicts:
#	autobuild.xml
#	indra/cmake/JsonCpp.cmake
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodelloader.cpp
#	indra/llprimitive/llmodelloader.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llkeyboardsdl.cpp
#	indra/llwindow/llkeyboardsdl.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llconversationloglist.cpp
#	indra/newview/lldirpicker.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 6fc9f2a6f0..50171ffcb0 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1728,8 +1728,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
         std::string user_data_path_cache = gDirUtilp->getCacheDir(false);
         user_data_path_cache += gDirUtilp->getDirDelimiter();
 
-        std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt");
-
         // See if the plugin executable exists
         llstat s;
         if(LLFile::stat(launcher_name, &s))
@@ -1738,14 +1736,13 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
         }
         else if(LLFile::stat(plugin_name, &s))
         {
-#if !LL_LINUX
             LL_WARNS_ONCE("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
-#endif
         }
         else
         {
             media_source = new LLPluginClassMedia(owner);
             media_source->setSize(default_width, default_height);
+            std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.log");
             media_source->setUserDataPath(user_data_path_cache, gDirUtilp->getUserName(), user_data_path_cef_log);
             media_source->setLanguageCode(LLUI::getLanguage());
             media_source->setZoomFactor(zoom_factor);
@@ -1773,6 +1770,11 @@ 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
+            bool media_plugin_pipewire_volume_catcher = gSavedSettings.getBOOL("MediaPluginPipeWireVolumeCatcher");
+            media_source->enablePipeWireVolumeCatcher( media_plugin_pipewire_volume_catcher );
+#endif
+
             // need to set agent string here before instance created
             media_source->setBrowserUserAgent(LLViewerMedia::getInstance()->getCurrentUserAgent());
 
@@ -1794,9 +1796,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
             }
         }
     }
-#if !LL_LINUX
     LL_WARNS_ONCE("Plugin") << "plugin initialization failed for mime type: " << media_type << LL_ENDL;
-#endif
 
     if(gAgent.isInitialized())
     {