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

SL-13830 One more coroutine crash

meow-7.2.2
Andrey Kleshchev 2020-08-22 00:37:23 +03:00
parent b856745048
commit 0e0ba2fd86
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llvoicevivox.cpp
View File

@ -411,6 +411,7 @@ void LLVivoxVoiceClient::terminate()
}
else
{
mRelogRequested = false;
killGateway();
}
}
@ -660,12 +661,18 @@ void LLVivoxVoiceClient::voiceControlCoro()
U32 retry = 0;
while (gAgent.getTeleportState() != LLAgent::TELEPORT_NONE)
while (gAgent.getTeleportState() != LLAgent::TELEPORT_NONE && !LLApp::isExiting())
{
LL_DEBUGS("Voice") << "Suspending voiceControlCoro() momentarily for teleport. Tuning: " << mTuningMode << ". Relog: " << mRelogRequested << LL_ENDL;
llcoro::suspendUntilTimeout(1.0);
}
if (LLApp::isExiting())
{
mIsCoroutineActive = false;
return;
}
do
{
bool success = startAndConnectSession();