summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-01-02 15:28:31 -0800
committerRoxie Linden <roxie@lindenlab.com>2024-02-22 23:11:36 -0800
commit1043accd9653022d138ea579968e6da65ea0ff3c (patch)
treebf28fe5101c52b696168ba1829891c92e5d637d1 /indra
parent1cdc25750c86c36ebad7cca711217a3cf8a30a8e (diff)
Set mute, speaker volume, mic gain on creation of new connection.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoicewebrtc.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 0c15dbccaf..dd18fabf47 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -358,8 +358,6 @@ void LLWebRTCVoiceClient::terminate()
void LLWebRTCVoiceClient::cleanUp()
{
- LL_DEBUGS("Voice") << LL_ENDL;
-
mNextAudioSession.reset();
mAudioSession.reset();
mNeighboringRegions.clear();
@@ -489,7 +487,10 @@ bool LLWebRTCVoiceClient::sessionState::processConnectionStates()
{
for (auto &neighbor : neighbor_ids)
{
- mWebRTCConnections.emplace_back(new LLVoiceWebRTCConnection(neighbor, INVALID_PARCEL_ID, mChannelID));
+ connectionPtr_t connection = mWebRTCConnections.emplace_back(new LLVoiceWebRTCConnection(neighbor, INVALID_PARCEL_ID, mChannelID));
+ connection->setMicGain(mMicGain);
+ connection->setMuteMic(mMuted);
+ connection->setSpeakerVolume(mSpeakerVolume);
}
}
return !mWebRTCConnections.empty();
@@ -2494,7 +2495,10 @@ void LLVoiceWebRTCConnection::OnDataReceived(const std::string &data, bool binar
{
if (voice_data[participant_id].get("l", Json::Value(false)).asBool())
{
- LLWebRTCVoiceClient::getInstance()->removeParticipantByID(mChannelID, agent_id);
+ if (agent_id != gAgentID)
+ {
+ LLWebRTCVoiceClient::getInstance()->removeParticipantByID(mChannelID, agent_id);
+ }
}
else
{