diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-08-14 20:52:00 +0800 |
| commit | ce8cb73ac37ce59a76c3ebfa684e8f1c94e8fd13 (patch) | |
| tree | 39237632c23f093b2ea9b0490b0a19cb2dee99e9 /indra/newview/llvoicevivox.cpp | |
| parent | f58cc7facb14ff6b6763652b433524e85a728cc3 (diff) | |
| parent | ab86e77818e76bdf3ef660b9fa964217265be3e7 (diff) | |
Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 6860c61c0e..06f5a5c948 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -5107,7 +5107,9 @@ void LLVivoxVoiceClient::processChannels(bool process) bool LLVivoxVoiceClient::isCurrentChannel(const LLSD &channelInfo) { - if (!mProcessChannels || (channelInfo.has("voice_server_type") && channelInfo["voice_server_type"].asString() != VIVOX_VOICE_SERVER_TYPE)) + if (!mProcessChannels + || (channelInfo.has("voice_server_type") && channelInfo["voice_server_type"].asString() != VIVOX_VOICE_SERVER_TYPE) + || mSessionTerminateRequested) { return false; } |