diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-04-08 21:30:36 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-04-08 21:30:36 -0700 |
| commit | b425165addbe1c141e050556ff4aa18c8d042dab (patch) | |
| tree | 56aa1acc4380f386866a5d554ce72eb1449c2220 /indra | |
| parent | 648741470f67120d99aec3a4aeceeaf4395cca09 (diff) | |
| parent | 39cb0bca32b4017e0d0c0ef7dc4433b97f4bc1ee (diff) | |
Merge branch 'roxie/webrtc-voice' of https://github.com/secondlife/viewer into roxie/webrtc-voice
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index cb01a079cc..710067c2bf 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -2823,6 +2823,11 @@ void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool b { participant->mIsSpeaking = voice_data[participant_id].get("v", Json::Value(false)).asBool(); } + + if (voice_data[participant_id].isMember("m")) + { + participant->mIsModeratorMuted = voice_data[participant_id].get("m", Json::Value(false)).asBool(); + } } } } |