Merge pull request #5852 from secondlife/marchcat/slua-26.2

26.2 -> SLua viewer

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index 01cfb17ced..bd7a2e0bcf 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -343,6 +343,7 @@ public:
                 inner_->InitRecording();
                 inner_->StartRecording();
             }
+            inner_->InitPlayout();
             inner_->StartPlayout();
         }
     }
@@ -479,6 +480,13 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceO
         mSignalingThread->PostTask(std::move(task), location);
     }
 
+    void PostDelayedSignalingTask(absl::AnyInvocable<void() &&> task,
+                  webrtc::TimeDelta delay,
+                  const webrtc::Location& location = webrtc::Location::Current())
+    {
+        mSignalingThread->PostDelayedTask(std::move(task), delay, location);
+    }
+
     void PostNetworkTask(absl::AnyInvocable<void() &&> task,
                   const webrtc::Location& location = webrtc::Location::Current())
     {
@@ -648,6 +656,8 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,
     void enableSenderTracks(bool enable);
     void enableReceiverTracks(bool enable);
 
+    void gatherConnectionStats() override;
+
   protected:
 
     LLWebRTCImpl * mWebRTCImpl;
@@ -673,6 +683,10 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,
     std::vector<LLWebRTCDataObserver *> mDataObserverList;
     webrtc::scoped_refptr<webrtc::DataChannelInterface> mDataChannel;
 
+    // connection state tracking for delayed renegotiation on disconnect
+    webrtc::PeerConnectionInterface::PeerConnectionState mPeerConnectionState;
+    uint32_t mDisconnectCount;
+
     std::atomic<int> mPendingJobs;
 };