Merge pull request #4492 Merge Develop into Maint-C (2025.06)

Merge Develop into Maint-C (2025.06)

2 files changed, 56 insertions, 7 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index a306600f85..28639b9af0 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -670,7 +670,10 @@ LLWebRTCPeerConnectionInterface *LLWebRTCImpl::newPeerConnection()
     peerConnection->init(this);
 
     mPeerConnections.emplace_back(peerConnection);
-    peerConnection->enableSenderTracks(!mMute);
+    // Should it really start disabled?
+    // Seems like something doesn't get the memo and senders need to be reset later
+    // to remove the voice indicator from taskbar
+    peerConnection->enableSenderTracks(false);
     if (mPeerConnections.empty())
     {
         setRecording(true);
@@ -704,7 +707,7 @@ void LLWebRTCImpl::freePeerConnection(LLWebRTCPeerConnectionInterface* peer_conn
 LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :
     mWebRTCImpl(nullptr),
     mPeerConnection(nullptr),
-    mMute(true),
+    mMute(MUTE_INITIAL),
     mAnswerReceived(false)
 {
 }
@@ -739,6 +742,19 @@ void LLWebRTCPeerConnectionImpl::terminate()
                     }
                 }
 
+                // to remove 'Secondlife is recording' icon from taskbar
+                // if user was speaking
+                auto senders = mPeerConnection->GetSenders();
+                for (auto& sender : senders)
+                {
+                    auto track = sender->track();
+                    if (track)
+                    {
+                        track->set_enabled(false);
+                    }
+                }
+                mPeerConnection->SetAudioRecording(false);
+
                 mPeerConnection->Close();
                 if (mLocalStream)
                 {
@@ -828,6 +844,7 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
             audioOptions.auto_gain_control = true;
             audioOptions.echo_cancellation = true;
             audioOptions.noise_suppression = true;
+            audioOptions.init_recording_on_send = false;
 
             mLocalStream = mPeerConnectionFactory->CreateLocalMediaStream("SLStream");
 
@@ -892,6 +909,7 @@ void LLWebRTCPeerConnectionImpl::enableSenderTracks(bool enable)
         {
             sender->track()->set_enabled(enable);
         }
+        mPeerConnection->SetAudioRecording(enable);
     }
 }
 
@@ -932,9 +950,17 @@ void LLWebRTCPeerConnectionImpl::AnswerAvailable(const std::string &sdp)
 
 void LLWebRTCPeerConnectionImpl::setMute(bool mute)
 {
-    mMute = mute;
+    EMicMuteState new_state = mute ? MUTE_MUTED : MUTE_UNMUTED;
+    if (new_state == mMute)
+    {
+        return; // no change
+    }
+    bool force_reset = mMute == MUTE_INITIAL && mute;
+    bool enable = !mute;
+    mMute = new_state;
+
     mWebRTCImpl->PostSignalingTask(
-        [this]()
+        [this, force_reset, enable]()
         {
         if (mPeerConnection)
         {
@@ -946,16 +972,34 @@ void LLWebRTCPeerConnectionImpl::setMute(bool mute)
                 auto track = sender->track();
                 if (track)
                 {
-                    track->set_enabled(!mMute);
+                    if (force_reset)
+                    {
+                        // Force notify observers
+                        // Was it disabled too early?
+                        // Without this microphone icon in Win's taskbar will stay
+                        track->set_enabled(true);
+                    }
+                    track->set_enabled(enable);
                 }
             }
+            mPeerConnection->SetAudioRecording(enable);
         }
     });
 }
 
 void LLWebRTCPeerConnectionImpl::resetMute()
 {
-    setMute(mMute);
+    switch(mMute)
+    {
+    case MUTE_MUTED:
+         setMute(true);
+         break;
+    case MUTE_UNMUTED:
+         setMute(false);
+         break;
+    default:
+        break;
+    }
 }
 
 void LLWebRTCPeerConnectionImpl::setReceiveVolume(float volume)
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index b93a1fdb01..b6294dbd4a 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -417,7 +417,12 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,
 
     rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> mPeerConnectionFactory;
 
-    bool mMute;
+    typedef enum {
+        MUTE_INITIAL,
+        MUTE_MUTED,
+        MUTE_UNMUTED,
+    } EMicMuteState;
+    EMicMuteState mMute;
 
     // signaling
     std::vector<LLWebRTCSignalingObserver *>  mSignalingObserverList;