diff options
author | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 18:40:25 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-06 18:40:25 -0700 |
commit | 74028326e8b81ec7ead20b1f2a4d7d1a7f4009d0 (patch) | |
tree | b893f956ff7e2a52220a5668367cd4220653d122 /indra/newview | |
parent | 4af9128db1fb65ff99d1e8086352698f46e049b4 (diff) |
The IM Floater speak button was disabled when making group calls
This is because the button enable state was updated before the
call had fully established.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index ddbe2eb552..b5c93d87f5 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -1414,13 +1414,19 @@ bool LLWebRTCVoiceClient::isCurrentChannel(const LLSD &channelInfo) return false; } - if (mSession) + sessionStatePtr_t session = mSession; + if (!session) + { + session = mNextSession; + } + + if (session) { if (!channelInfo["session_handle"].asString().empty()) { - return mSession->mHandle == channelInfo["session_handle"].asString(); + return session->mHandle == channelInfo["session_handle"].asString(); } - return channelInfo["channel_uri"].asString() == mSession->mChannelID; + return channelInfo["channel_uri"].asString() == session->mChannelID; } return false; } |