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

Fix enable/disable issue when connecting to multiple regions

meow-7.2.2
Roxie Linden 2023-12-25 17:41:48 -08:00
parent c393c3bd2b
commit 3f2d52e5df
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llvoicewebrtc.cpp
View File

@ -362,6 +362,7 @@ void LLWebRTCVoiceClient::cleanUp()
mNextAudioSession.reset();
mAudioSession.reset();
mNeighboringRegions.clear();
sessionState::for_each(boost::bind(predShutdownSession, _1));
LL_DEBUGS("Voice") << "exiting" << LL_ENDL;
}
@ -510,7 +511,6 @@ void LLWebRTCVoiceClient::voiceConnectionCoro()
{
continue;
}
mNeighboringRegions.insert(regionp->getRegionID());
bool voiceEnabled = mVoiceEnabled && regionp->isVoiceEnabled();
// check to see if parcel changed.
std::string channelID = "Estate";
@ -1215,6 +1215,7 @@ bool LLWebRTCVoiceClient::setSpatialChannel(
}
else
{
mNeighboringRegions.insert(gAgent.getRegion()->getRegionID());
return switchChannel(uri, parcel_local_id == INVALID_PARCEL_ID ? sessionState::SESSION_TYPE_ESTATE : sessionState::SESSION_TYPE_PARCEL, parcel_local_id);
}
}
@ -1535,10 +1536,7 @@ void LLWebRTCVoiceClient::updatePosition(void)
enforceTether();
if (mSpatialCoordsDirty)
{
updateNeighboringRegions();
}
updateNeighboringRegions();
}
}
@ -2843,7 +2841,7 @@ bool LLVoiceWebRTCConnection::breakVoiceConnection(bool corowait)
if (!regionp || !regionp->capabilitiesReceived())
{
LL_DEBUGS("Voice") << "no capabilities for voice provisioning; waiting " << LL_ENDL;
setVoiceConnectionState(VOICE_STATE_WAIT_FOR_EXIT);
setVoiceConnectionState(VOICE_STATE_SESSION_EXIT);
return false;
}