From 31f066bb9fa9f2ee3740ad336eac1410b46c0626 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 9 Apr 2023 20:02:04 -0400
Subject: [PATCH] Fix voice not connecting
---
indra/newview/llvoicevivox.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 7d1c31f6970..764637e7b70 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2076,7 +2076,7 @@ bool LLVivoxVoiceClient::waitForChannel()
{
recordingAndPlaybackMode();
}
- else if (checkParcelChanged() || (!mAreaVoiceDisabled && mNextAudioSession == nullptr))
+ else if ((checkParcelChanged() || mNextAudioSession == nullptr) && !mAreaVoiceDisabled)
{
// the parcel is changed, or we have no pending audio sessions,
// so try to request the parcel voice info
@@ -2087,8 +2087,6 @@ bool LLVivoxVoiceClient::waitForChannel()
{
LL_INFOS("Voice") << "Session requesting reprovision and login." << LL_ENDL;
requestRelog();
- state = VOICE_CHANNEL_STATE_RELOG;
- break;
}
else if (mNextAudioSession)
{
@@ -2097,7 +2095,6 @@ bool LLVivoxVoiceClient::waitForChannel()
if (!runSession(joinSession)) //suspends
{
LL_DEBUGS("Voice") << "runSession returned false; leaving inner loop" << LL_ENDL;
- return false;
}
else
{
--
GitLab