From 8530eadd982d71a495fa3898e8fc136b230143ba Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Sat, 16 Mar 2024 15:17:35 -0700 Subject: Fix crash in setting peer volume/mute Also fix issue where moving to a 'voice disabled' parcel and back to the region (with voice) resulted in the voice dot not showing up. --- indra/newview/llvoicewebrtc.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra/newview') 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); + } } -- cgit v1.2.3