Merge branch 'main' into marchcat/2505-merge

# Conflicts:
#	.github/workflows/qatest.yaml
#	indra/llcommon/llsdutil.h
#	indra/llui/llflatlistview.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitgallery.h

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 0daa767766..a306600f85 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -430,9 +430,7 @@ void ll_set_device_module_capture_device(rtc::scoped_refptr<webrtc::AudioDeviceM
     // has it at 0
     device_module->SetRecordingDevice(device + 1);
 #endif
-    device_module->SetStereoRecording(false);
     device_module->InitMicrophone();
-    device_module->InitRecording();
 }
 
 void LLWebRTCImpl::setCaptureDevice(const std::string &id)
@@ -473,6 +471,8 @@ void LLWebRTCImpl::setCaptureDevice(const std::string &id)
                 ll_set_device_module_capture_device(mPeerDeviceModule, recordingDevice);
                 if (recording)
                 {
+                    mPeerDeviceModule->SetStereoRecording(false);
+                    mPeerDeviceModule->InitRecording();
                     mPeerDeviceModule->StartRecording();
                 }
             });
@@ -494,9 +494,7 @@ void ll_set_device_module_render_device(rtc::scoped_refptr<webrtc::AudioDeviceMo
 #else
     device_module->SetPlayoutDevice(device + 1);
 #endif
-    device_module->SetStereoPlayout(true);
     device_module->InitSpeaker();
-    device_module->InitPlayout();
 }
 
 void LLWebRTCImpl::setRenderDevice(const std::string &id)
@@ -540,6 +538,8 @@ void LLWebRTCImpl::setRenderDevice(const std::string &id)
                 ll_set_device_module_render_device(mPeerDeviceModule, playoutDevice);
                 if (playing)
                 {
+                    mPeerDeviceModule->SetStereoPlayout(true);
+                    mPeerDeviceModule->InitPlayout();
                     mPeerDeviceModule->StartPlayout();
                 }
             });