Merge branch 'develop' into callum/viewer-cef-2025-08

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 28639b9af0..20951ff816 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -904,12 +904,12 @@ void LLWebRTCPeerConnectionImpl::enableSenderTracks(bool enable)
     // set_enabled shouldn't be done on the worker thread.
     if (mPeerConnection)
     {
+        mPeerConnection->SetAudioRecording(enable);
         auto senders = mPeerConnection->GetSenders();
         for (auto &sender : senders)
         {
             sender->track()->set_enabled(enable);
         }
-        mPeerConnection->SetAudioRecording(enable);
     }
 }
 
@@ -964,6 +964,9 @@ void LLWebRTCPeerConnectionImpl::setMute(bool mute)
         {
         if (mPeerConnection)
         {
+            // SetAudioRecording must be called before enabling/disabling tracks.
+            mPeerConnection->SetAudioRecording(enable);
+
             auto senders = mPeerConnection->GetSenders();
 
             RTC_LOG(LS_INFO) << __FUNCTION__ << (mMute ? "disabling" : "enabling") << " streams count " << senders.size();
@@ -982,7 +985,6 @@ void LLWebRTCPeerConnectionImpl::setMute(bool mute)
                     track->set_enabled(enable);
                 }
             }
-            mPeerConnection->SetAudioRecording(enable);
         }
     });
 }