summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-08-06 15:39:21 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-08-06 19:34:00 +0300
commitbf21677305f7dc725cb0872ee3bcf251efef40f7 (patch)
tree86880a97c5bd4aaa3ae8c0f83a320b20ba6389a6 /indra/newview/llvoicevivox.cpp
parentab07023c93bdf514f4f84dc63b814d9acbe8af76 (diff)
viewer-private#261 (Vivox) Viewer doesn't reconnect to voice chat
If state was 'ringing' viewer failed to set mSessionTerminateRequested on cancel so the call kept sort of going
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 3392e4de86..13402513ef 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2149,7 +2149,6 @@ bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)
mIsInChannel = true;
mMuteMicDirty = true;
- mSessionTerminateRequested = false;
while (!sShuttingDown
&& mVoiceEnabled
@@ -5435,8 +5434,8 @@ void LLVivoxVoiceClient::leaveChannel(void)
{
LL_DEBUGS("Voice") << "leaving channel for teleport/logout" << LL_ENDL;
mChannelName.clear();
- sessionTerminate();
}
+ sessionTerminate();
}
void LLVivoxVoiceClient::setMuteMic(bool muted)