3 files changed, 35 insertions, 21 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 97c04ae446..14fb63ec2a 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -280,9 +280,15 @@ void LLWebRTCImpl::terminate()
     {
         connection->terminate();
     }
-    mPeerConnections.clear();
+
+    // connection->terminate() above spawns a number of Signaling thread calls to
+    // shut down the connection.  The following Blocking Call will wait
+    // until they're done before it's executed, allowing time to clean up.
 
     mSignalingThread->BlockingCall([this]() { mPeerConnectionFactory = nullptr; });
+
+    mPeerConnections.clear();
+
     mWorkerThread->BlockingCall(
         [this]()
         {
@@ -627,7 +633,6 @@ void LLWebRTCImpl::freePeerConnection(LLWebRTCPeerConnectionInterface* peer_conn
     std::find(mPeerConnections.begin(), mPeerConnections.end(), peer_connection);
     if (it != mPeerConnections.end())
     {
-        (*it)->terminate();
         mPeerConnections.erase(it);
     }
     if (mPeerConnections.empty())
@@ -645,7 +650,6 @@ void LLWebRTCImpl::freePeerConnection(LLWebRTCPeerConnectionInterface* peer_conn
 
 LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() : 
     mWebRTCImpl(nullptr),
-    mClosing(false),
     mPeerConnection(nullptr),
     mMute(false),
     mAnswerReceived(false)
@@ -654,7 +658,6 @@ LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :
 
 LLWebRTCPeerConnectionImpl::~LLWebRTCPeerConnectionImpl()
 {
-    terminate();
     mSignalingObserverList.clear();
     mDataObserverList.clear();
 }
@@ -670,24 +673,35 @@ void LLWebRTCPeerConnectionImpl::init(LLWebRTCImpl * webrtc_impl)
 }
 void LLWebRTCPeerConnectionImpl::terminate()
 {
-    rtc::scoped_refptr<webrtc::PeerConnectionInterface> connection;
-    mPeerConnection.swap(connection);
-    rtc::scoped_refptr<webrtc::DataChannelInterface> dataChannel;
-    mDataChannel.swap(dataChannel);
-    rtc::scoped_refptr<webrtc::MediaStreamInterface> localStream;
-    mLocalStream.swap(localStream);
-
     mWebRTCImpl->PostSignalingTask(
         [=]()
         {
-            if (connection)
-            {
-                connection->Close();
-            }
-            if (dataChannel)
+            if (mPeerConnection)
             {
-                dataChannel->UnregisterObserver();
-                dataChannel->Close();
+                if (mDataChannel)
+                {
+                    {
+                        mDataChannel->Close();
+                        mDataChannel = nullptr;
+                    }
+                }
+
+                mPeerConnection->Close();
+                if (mLocalStream)
+                {
+                    auto tracks = mLocalStream->GetAudioTracks();
+                    for (auto& track : tracks)
+                    {
+                        mLocalStream->RemoveTrack(track);
+                    }
+                    mLocalStream = nullptr;
+                }
+                mPeerConnection = nullptr;
+
+                for (auto &observer : mSignalingObserverList)
+                {
+                    observer->OnPeerConnectionClosed();
+                }
             }
         });
 }
@@ -811,7 +825,6 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
 
 bool LLWebRTCPeerConnectionImpl::shutdownConnection()
 {
-    mClosing = true;
     terminate();
     return true;
 }
diff --git a/indra/llwebrtc/llwebrtc.h b/indra/llwebrtc/llwebrtc.h
index ac71e0c744..ecbab81538 100644
--- a/indra/llwebrtc/llwebrtc.h
+++ b/indra/llwebrtc/llwebrtc.h
@@ -212,6 +212,9 @@ class LLWebRTCSignalingObserver
     // Called when a connection enters a failure state and renegotiation is needed.
     virtual void OnRenegotiationNeeded() = 0;
 
+    // Called when a peer connection has shut down
+    virtual void OnPeerConnectionClosed() = 0;
+
     // Called when the audio channel has been established and audio
     // can begin.
     virtual void OnAudioEstablished(LLWebRTCAudioInterface *audio_interface) = 0;
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index 984aaef734..448d36e3ea 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -355,8 +355,6 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,
 
     LLWebRTCImpl * mWebRTCImpl;
 
-    bool mClosing;
-
     rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> mPeerConnectionFactory;
 
     bool mMute;