SL-11058 Viewer "Voice is down" dialogs can stack up

meow-7.2.2
andreykproductengine 2019-05-02 18:34:06 +03:00
parent 97c2c3b0b9
commit 219944d14e
2 changed files with 9 additions and 1 deletions

View File

@ -666,7 +666,8 @@ void LLVivoxVoiceClient::voiceControlCoro()
do
{
if (startAndConnectSession())
bool success = startAndConnectSession();
if (success)
{
if (mTuningMode)
{
@ -689,6 +690,12 @@ void LLVivoxVoiceClient::voiceControlCoro()
<< LL_ENDL;
if (mRelogRequested)
{
if (!success)
{
// We failed to connect, give it a bit time before retrying.
llcoro::suspendUntilTimeout(5.0);
}
LL_INFOS("Voice") << "will attempt to reconnect to voice" << LL_ENDL;
while (isGatewayRunning() || gAgent.getTeleportState() != LLAgent::TELEPORT_NONE)
{

View File

@ -8632,6 +8632,7 @@ Please check your network and firewall setup.
icon="alertmodal.tga"
name="NoVoiceConnect"
type="alertmodal">
<unique/>
We are unable to connect to the voice server:
[HOSTID]