livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119 from secondlife/roxie/webrtc-voice 

Update webrtc path; fix crash; fix region voice not always working issue.
master
Roxanne Skelly 2024-03-18 18:13:22 -07:00 committed by GitHub
parent 23ecf64b24 3794e3275c
commit 410be3b2d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 772 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1526
autobuild.xml
View File

File diff suppressed because it is too large Load Diff

2
indra/cmake/WebRTC.cmake
View File

@ -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 )

12
indra/newview/llvoicewebrtc.cpp
View File

@ -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);
}
}