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

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.
master
Roxie Linden 2024-03-16 15:17:35 -07:00
parent dbbbbc55af
commit 8530eadd98
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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