Fix connection failed logic to do a renegotiate.

Also, remove some dead code.

2 files changed, 4 insertions, 70 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 93e9db9c1d..862325c3f1 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -425,15 +425,13 @@ void LLWebRTCImpl::OnConnectionChange(webrtc::PeerConnectionInterface::PeerConne
             }
             break;
         }
-        case webrtc::PeerConnectionInterface::PeerConnectionState::kDisconnected:
+        case webrtc::PeerConnectionInterface::PeerConnectionState::kFailed:
         {
-            if (new_state == webrtc::PeerConnectionInterface::PeerConnectionState::kConnected)
+            for (auto &observer : mSignalingObserverList)
             {
-                for (auto &observer : mSignalingObserverList)
-                {
-                    observer->OnRenegotiationNeeded();
-                }
+                observer->OnRenegotiationNeeded();
             }
+
             break;
         }
         default:
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 23033c5fee..bbe54018e8 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -2633,70 +2633,6 @@ void LLWebRTCVoiceClient::sendPositionAndVolumeUpdate(void)
 
 void LLWebRTCVoiceClient::sendLocalAudioUpdates()
 {
-	// Check all of the dirty states and then send messages to those needing to be changed.
-	// Tuningmode hands its own mute settings.
-	std::ostringstream stream;
-
-	if (mMuteMicDirty && !mTuningMode)
-	{
-		mMuteMicDirty = false;
-
-		// Send a local mute command.
-
-		LL_INFOS("Voice") << "Sending MuteLocalMic command with parameter " << (mMuteMic ? "true" : "false") << LL_ENDL;
-
-		stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.MuteLocalMic.1\">"
-			<< "<ConnectorHandle>" << LLWebRTCSecurity::getInstance()->connectorHandle() << "</ConnectorHandle>"
-			<< "<Value>" << (mMuteMic ? "true" : "false") << "</Value>"
-			<< "</Request>\n\n\n";
-
-	}
-
-	if (mSpeakerMuteDirty && !mTuningMode)
-	{
-		const char *muteval = ((mSpeakerVolume <= 0.0) ? "true" : "false");
-
-		mSpeakerMuteDirty = false;
-
-		LL_INFOS("Voice") << "Setting speaker mute to " << muteval << LL_ENDL;
-
-		stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.MuteLocalSpeaker.1\">"
-			<< "<ConnectorHandle>" << LLWebRTCSecurity::getInstance()->connectorHandle() << "</ConnectorHandle>"
-			<< "<Value>" << muteval << "</Value>"
-			<< "</Request>\n\n\n";
-
-	}
-
-	if (mSpeakerVolumeDirty)
-	{
-		mSpeakerVolumeDirty = false;
-
-		LL_INFOS("Voice") << "Setting speaker volume to " << mSpeakerVolume << LL_ENDL;
-
-		stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.SetLocalSpeakerVolume.1\">"
-			<< "<ConnectorHandle>" << LLWebRTCSecurity::getInstance()->connectorHandle() << "</ConnectorHandle>"
-			<< "<Value>" << mSpeakerVolume << "</Value>"
-			<< "</Request>\n\n\n";
-
-	}
-
-	if (mMicVolumeDirty)
-	{
-		mMicVolumeDirty = false;
-
-		LL_INFOS("Voice") << "Setting mic volume to " << mMicVolume << LL_ENDL;
-
-		stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.SetLocalMicVolume.1\">"
-			<< "<ConnectorHandle>" << LLWebRTCSecurity::getInstance()->connectorHandle() << "</ConnectorHandle>"
-			<< "<Value>" << mMicVolume << "</Value>"
-			<< "</Request>\n\n\n";
-	}
-
-
-	if (!stream.str().empty())
-	{
-		writeString(stream.str());
-	}
 }
 
 /**