diff options
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 9 | ||||
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 4 | 
3 files changed, 13 insertions, 8 deletions
| diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 19ce47d357..7fa5c957b6 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -31,14 +31,6 @@ set(llplugin_HEADER_FILES      llpluginsharedmemory.h      ) -if(NOT ADDRESS_SIZE EQUAL 32) -  if(WINDOWS) -    ##add_definitions(/FIXED:NO) -  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN -    add_definitions(-fPIC) -  endif(WINDOWS) -endif(NOT ADDRESS_SIZE EQUAL 32) -  list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})  add_library (llplugin ${llplugin_SOURCE_FILES}) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 505cb7fc41..3c5d216938 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -985,6 +985,15 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable )      sendMessage( message );  } +#if LL_LINUX +void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable ) +{ +    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher"); +    message.setValueBoolean( "enable", enable ); +    sendMessage( message ); +} +#endif +  void LLPluginClassMedia::setTarget(const std::string &target)  {      mTarget = target; diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index d74b790d8f..5d2f3bbb79 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -135,6 +135,10 @@ public:      // Text may be unicode (utf8 encoded)      bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data); +#if LL_LINUX +    void enablePipeWireVolumeCatcher( bool enable ); +#endif +      static std::string sOIDcookieUrl;      static std::string sOIDcookieName;      static std::string sOIDcookieValue; | 
