diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index a9adc418315dfe54f978fa8a7e573bfbc811dc75..d6411e8da9175dccd78e1fe60e0402bd1056852c 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -26,7 +26,7 @@ elseif (DARWIN) ${COCOA_LIBRARY} ) elseif (LINUX) - target_link_libraries( ll::webrtc INTERFACE libwebrtc ) + target_link_libraries( ll::webrtc INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libwebrtc.a X11 ) endif (WINDOWS) diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp index 34d950b80493de42aa1945b950392141620389ca..3078b86a43dbcac3d60eec2e8648cc4fd96afd99 100644 --- a/indra/llwebrtc/llwebrtc.cpp +++ b/indra/llwebrtc/llwebrtc.cpp @@ -26,7 +26,6 @@ #include "llwebrtc_impl.h" #include <algorithm> -#include <format> #include <string.h> #include "api/audio_codecs/audio_decoder_factory.h" diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 38810a29b59a3f269a893b7f90ae153890d2ef83..f4fa9ae82c48519653b36ed6e752a5a337238cec 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -35,6 +35,7 @@ #define WEBRTC_POSIX 1 #elif __linux__ #define WEBRTC_LINUX 1 +#define WEBRTC_POSIX 1 #endif #include "llwebrtc.h" diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index b53d245718691b7f038220f9e84d14ea45efbb33..d8f28cd1c3961a8e9fdc9653b76b73511004a913 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -2696,7 +2696,7 @@ void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool b nlohmann::json user_gain = nlohmann::json::object(); for (auto &participant_id : voice_data) { - LLUUID agent_id(participant_id); + LLUUID agent_id(to_string(participant_id)); if (agent_id.isNull()) { LL_WARNS("Voice") << "Bad participant ID from data channel (" << participant_id << "):" << data << LL_ENDL; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0e64cadcb358f26f72e72cb5f08b27a2f01b4628..37758253c6bf87d0bdbb4c85f51c7a1121bc26cc 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1200,6 +1200,9 @@ def construct(self): with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'llplugin', 'locales')): self.path("*.pak") + with self.prefix(src=os.path.join(self.args['build'], os.pardir, "llwebrtc"), dst="lib"): + self.path("libllwebrtc.so") + self.path("featuretable_linux.txt") with self.prefix(src=pkgdir, dst="app_settings"):