diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-03-18 18:13:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-18 18:13:22 -0700 |
| commit | 410be3b2d0ebbf6746140712430e54270541aecd (patch) | |
| tree | 17760a5fbb4a2f3b0bf36b9a434fab1abb09fb51 /indra | |
| parent | 23ecf64b248adafabdf391599f2c84418acbc954 (diff) | |
| parent | 3794e3275c5fd2845d57cf99ae93c9632e9a6d69 (diff) | |
Merge pull request #119 from secondlife/roxie/webrtc-voice
Update webrtc path; fix crash; fix region voice not always working issue.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/WebRTC.cmake | 2 | ||||
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/indra/cmake/WebRTC.cmake b/indra/cmake/WebRTC.cmake index 909a1345ed..a9adc41831 100644 --- a/indra/cmake/WebRTC.cmake +++ b/indra/cmake/WebRTC.cmake @@ -6,7 +6,7 @@ include_guard() add_library( ll::webrtc INTERFACE IMPORTED ) target_include_directories( ll::webrtc SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/webrtc" "${LIBS_PREBUILT_DIR}/include/webrtc/third_party/abseil-cpp") -use_prebuilt_binary(webrtc-shim) +use_prebuilt_binary(webrtc) if (WINDOWS) target_link_libraries( ll::webrtc INTERFACE webrtc.lib ) diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 7be02c1e21..cae7154bc2 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -465,7 +465,7 @@ void LLWebRTCVoiceClient::voiceConnectionCoro() } } } - if (useEstateVoice && !inEstateChannel()) + if (voiceEnabled && useEstateVoice && !inEstateChannel()) { // estate voice startEstateSession(); @@ -2251,7 +2251,10 @@ void LLVoiceWebRTCConnection::setUserVolume(const LLUUID& id, F32 volume) root["ug"] = user_gain; Json::FastWriter writer; std::string json_data = writer.write(root); - mWebRTCDataInterface->sendData(json_data, false); + if (mWebRTCDataInterface) + { + mWebRTCDataInterface->sendData(json_data, false); + } } void LLVoiceWebRTCConnection::setUserMute(const LLUUID& id, bool mute) @@ -2262,7 +2265,10 @@ void LLVoiceWebRTCConnection::setUserMute(const LLUUID& id, bool mute) root["m"] = muted; Json::FastWriter writer; std::string json_data = writer.write(root); - mWebRTCDataInterface->sendData(json_data, false); + if (mWebRTCDataInterface) + { + mWebRTCDataInterface->sendData(json_data, false); + } } |