diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-08-09 09:09:00 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-08-09 12:28:20 +0300 |
| commit | 4e0819b2dc2f062a68cc32d5b1ec22214fb1fd28 (patch) | |
| tree | 48d35108157d7f6664e9a89fac48cd843b5ee2e8 /indra | |
| parent | 735ad360d2fb64246622d53be6ece683fc121a02 (diff) | |
viewer-private#259 Chat names get mixed up in voice calls
Obsolete channel was uses as a participant provider
Diffstat (limited to 'indra')
| -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 6be6b1d4f2..cf27801065 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -5097,7 +5097,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; } |