livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2372 from secondlife/roxie/webrtc-fix-mac-p2p-hang 

Fix hang when incoming p2p or group calls throw up dialog.
meow-7.2.2
Brad Linden 2024-08-21 09:49:54 -07:00 committed by GitHub
parent 738b39fbab 7b1d1852c2
commit 27fa9b8138
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llvoicewebrtc.cpp
View File

@ -549,13 +549,19 @@ void LLWebRTCVoiceClient::voiceConnectionCoro()
updatePosition();
}
}
sessionState::processSessionStates();
if (mProcessChannels && voiceEnabled && !mHidden)
{
sendPositionUpdate(false);
updateOwnVolume();
}
LL::WorkQueue::postMaybe(mMainQueue,
[=] {
if (sShuttingDown)
{
return;
}
sessionState::processSessionStates();
if (mProcessChannels && voiceEnabled && !mHidden)
{
sendPositionUpdate(false);
updateOwnVolume();
}
});
}
}
catch (const LLCoros::Stop&)
@ -2221,6 +2227,7 @@ void LLVoiceWebRTCConnection::OnIceCandidate(const llwebrtc::LLWebRTCIceCandidat
void LLVoiceWebRTCConnection::processIceUpdates()
{
mOutstandingRequests++;
LLCoros::getInstance()->launch("LLVoiceWebRTCConnection::processIceUpdatesCoro",
boost::bind(&LLVoiceWebRTCConnection::processIceUpdatesCoro, this->shared_from_this()));
}