MAINT-6172: Send the render and mic devices to a session when they are dirty, not just in Tuning mode.

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index c8bfc63a6a..660ca9e5b7 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1470,6 +1470,7 @@ bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)
 
     while (mVoiceEnabled && !mSessionTerminateRequested && !mTuningMode)
     {
+        sendCaptureAndRenderDevices();
         if (mAudioSession && mAudioSession->mParticipantsChanged)
         {
             mAudioSession->mParticipantsChanged = false;
@@ -1557,6 +1558,24 @@ bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)
     return true;
 }
 
+void LLVivoxVoiceClient::sendCaptureAndRenderDevices()
+{
+    if (mCaptureDeviceDirty || mRenderDeviceDirty)
+    {
+        std::ostringstream stream;
+
+        buildSetCaptureDevice(stream);
+        buildSetRenderDevice(stream);
+
+        if (!stream.str().empty())
+        {
+            writeString(stream.str());
+        }
+
+        llcoro::suspendUntilTimeout(UPDATE_THROTTLE_SECONDS);
+    }
+}
+
 void LLVivoxVoiceClient::recordingAndPlaybackMode()
 {
     LL_INFOS("Voice") << "In voice capture/playback mode." << LL_ENDL;