From 74028326e8b81ec7ead20b1f2a4d7d1a7f4009d0 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 6 May 2024 18:40:25 -0700 Subject: 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. --- indra/newview/llvoicewebrtc.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'indra') 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; } -- cgit v1.2.3