From 07d7779d87552133e98df835bfdcb0a1fb5b10ca Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Sat, 20 Apr 2024 17:34:27 -0700
Subject: Vivox wasn't ren-enabling voice after ending a p2p call
---
indra/newview/llvoicevivox.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 6ff81760b2..88fc40e565 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4952,6 +4952,7 @@ bool LLVivoxVoiceClient::setSpatialChannel(const LLSD& channelInfo)
void LLVivoxVoiceClient::callUser(const LLUUID &uuid)
{
std::string userURI = sipURIFromID(uuid);
+ mProcessChannels = true;
switchChannel(userURI, false, true, true);
}
@@ -4974,7 +4975,7 @@ bool LLVivoxVoiceClient::answerInvite(const std::string &sessionHandle)
session->mIsSpatial = false;
session->mReconnect = false;
session->mIsP2P = true;
-
+ mProcessChannels = true;
joinSession(session);
return true;
}
@@ -5078,7 +5079,9 @@ void LLVivoxVoiceClient::leaveNonSpatialChannel()
void LLVivoxVoiceClient::processChannels(bool process)
{
- mProcessChannels = process;
+ mCurrentParcelLocalID = -1;
+ mCurrentRegionName.clear();
+ mProcessChannels = process;
}
bool LLVivoxVoiceClient::isCurrentChannel(const LLSD &channelInfo)
--
cgit v1.2.3