1 files changed, 25 insertions, 2 deletions
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index c51bcfcdd5..a1e125a8f2 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -629,6 +629,9 @@ void LLWebRTCPeerConnectionImpl::terminate()
     rtc::scoped_refptr<webrtc::MediaStreamInterface> localStream;
     mLocalStream.swap(localStream);
 
+    mSignalingObserverList.clear();
+    mDataObserverList.clear();
+
     mWebRTCImpl->PostSignalingTask(
         [=]()
         {
@@ -1114,6 +1117,10 @@ void LLWebRTCPeerConnectionImpl::OnSuccess(webrtc::SessionDescriptionInterface *
 void LLWebRTCPeerConnectionImpl::OnFailure(webrtc::RTCError error)
 {
     RTC_LOG(LS_ERROR) << ToString(error.type()) << ": " << error.message();
+    for (auto &observer : mSignalingObserverList)
+    {
+        observer->OnRenegotiationNeeded();
+    }
 }
 
 //
@@ -1127,6 +1134,10 @@ void LLWebRTCPeerConnectionImpl::OnSetRemoteDescriptionComplete(webrtc::RTCError
     if (!error.ok())
     {
         RTC_LOG(LS_ERROR) << ToString(error.type()) << ": " << error.message();
+        for (auto &observer : mSignalingObserverList)
+        {
+            observer->OnRenegotiationNeeded();
+        }
         return;
     }
     mAnswerReceived = true;
@@ -1144,7 +1155,10 @@ void LLWebRTCPeerConnectionImpl::OnSetRemoteDescriptionComplete(webrtc::RTCError
         }
     }
     mCachedIceCandidates.clear();
-    OnIceGatheringChange(mPeerConnection->ice_gathering_state());
+    if (mPeerConnection)
+    {
+        OnIceGatheringChange(mPeerConnection->ice_gathering_state());
+    }
 
 }
 
@@ -1161,6 +1175,10 @@ void LLWebRTCPeerConnectionImpl::OnSetLocalDescriptionComplete(webrtc::RTCError
 
 void LLWebRTCPeerConnectionImpl::OnStateChange()
 {
+    if (!mDataChannel)
+    {
+        return;
+    }
     RTC_LOG(LS_INFO) << __FUNCTION__ << " Data Channel State: " << webrtc::DataChannelInterface::DataStateString(mDataChannel->state());
     switch (mDataChannel->state())
     {
@@ -1204,7 +1222,12 @@ void LLWebRTCPeerConnectionImpl::sendData(const std::string& data, bool binary)
     {
         rtc::CopyOnWriteBuffer cowBuffer(data.data(), data.length());
         webrtc::DataBuffer     buffer(cowBuffer, binary);
-        mDataChannel->Send(buffer);
+        mWebRTCImpl->PostNetworkTask([this, buffer]() {
+                if (mDataChannel)
+                {
+                    mDataChannel->Send(buffer);
+                }
+            });
     }
 }