#2007 The 'No device' option isn't displayed in the 'Input/Output' drop-down boxes

11 files changed, 135 insertions, 80 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 0daa767766..a73962f3d6 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -45,6 +45,10 @@ static int16_t PLAYOUT_DEVICE_BAD     = -2;
 static int16_t RECORD_DEVICE_DEFAULT  = -1;
 static int16_t RECORD_DEVICE_BAD      = -2;
 
+static const std::string DEFAULT_DEVICE_NAME = "Default";
+static const std::string NO_DEVICE_NAME = "No Device";
+static const std::string NO_DEVICE_GUID;
+
 LLAudioDeviceObserver::LLAudioDeviceObserver() : mSumVector {0}, mMicrophoneEnergy(0.0) {}
 
 float LLAudioDeviceObserver::getMicrophoneEnergy() { return mMicrophoneEnergy; }
@@ -438,7 +442,7 @@ void ll_set_device_module_capture_device(rtc::scoped_refptr<webrtc::AudioDeviceM
 void LLWebRTCImpl::setCaptureDevice(const std::string &id)
 {
     int16_t recordingDevice = RECORD_DEVICE_DEFAULT;
-    if (id != "Default")
+    if (id != DEFAULT_DEVICE_NAME)
     {
         for (int16_t i = 0; i < mRecordingDeviceList.size(); i++)
         {
@@ -502,7 +506,7 @@ void ll_set_device_module_render_device(rtc::scoped_refptr<webrtc::AudioDeviceMo
 void LLWebRTCImpl::setRenderDevice(const std::string &id)
 {
     int16_t playoutDevice = PLAYOUT_DEVICE_DEFAULT;
-    if (id != "Default")
+    if (id != DEFAULT_DEVICE_NAME)
     {
         for (int16_t i = 0; i < mPlayoutDeviceList.size(); i++)
         {
@@ -546,6 +550,16 @@ void LLWebRTCImpl::setRenderDevice(const std::string &id)
     }
 }
 
+bool LLWebRTCImpl::isCaptureNoDevice()
+{
+    return mRecordingDevice == mRecordingNoDevice;
+}
+
+bool LLWebRTCImpl::isRenderNoDevice()
+{
+    return mPlayoutDevice == mPlayoutNoDevice;
+}
+
 // updateDevices needs to happen on the worker thread.
 void LLWebRTCImpl::updateDevices()
 {
@@ -566,6 +580,11 @@ void LLWebRTCImpl::updateDevices()
         mTuningDeviceModule->PlayoutDeviceName(index, name, guid);
         mPlayoutDeviceList.emplace_back(name, guid);
     }
+    mPlayoutNoDevice = (int32_t)mPlayoutDeviceList.size();
+    if (mPlayoutNoDevice)
+    {
+        mPlayoutDeviceList.emplace_back(NO_DEVICE_NAME, NO_DEVICE_GUID);
+    }
 
     int16_t captureDeviceCount        = mTuningDeviceModule->RecordingDevices();
 
@@ -584,6 +603,11 @@ void LLWebRTCImpl::updateDevices()
         mTuningDeviceModule->RecordingDeviceName(index, name, guid);
         mRecordingDeviceList.emplace_back(name, guid);
     }
+    mRecordingNoDevice = (int32_t)mRecordingDeviceList.size();
+    if (mRecordingNoDevice)
+    {
+        mRecordingDeviceList.emplace_back(NO_DEVICE_NAME, NO_DEVICE_GUID);
+    }
 
     for (auto &observer : mVoiceDevicesObserverList)
     {
@@ -933,20 +957,20 @@ void LLWebRTCPeerConnectionImpl::AnswerAvailable(const std::string &sdp)
 void LLWebRTCPeerConnectionImpl::setMute(bool mute)
 {
     mMute = mute;
+    mute |= mWebRTCImpl->isCaptureNoDevice();
     mWebRTCImpl->PostSignalingTask(
-        [this]()
+        [&]()
         {
         if (mPeerConnection)
         {
             auto senders = mPeerConnection->GetSenders();
 
-            RTC_LOG(LS_INFO) << __FUNCTION__ << (mMute ? "disabling" : "enabling") << " streams count " << senders.size();
+            RTC_LOG(LS_INFO) << __FUNCTION__ << (mute ? "disabling" : "enabling") << " streams count " << senders.size();
             for (auto &sender : senders)
             {
-                auto track = sender->track();
-                if (track)
+                if (auto track = sender->track())
                 {
-                    track->set_enabled(!mMute);
+                    track->set_enabled(!mute);
                 }
             }
         }
@@ -960,6 +984,11 @@ void LLWebRTCPeerConnectionImpl::resetMute()
 
 void LLWebRTCPeerConnectionImpl::setReceiveVolume(float volume)
 {
+    if (mWebRTCImpl->isRenderNoDevice())
+    {
+        volume = 0;
+    }
+
     mWebRTCImpl->PostSignalingTask(
         [this, volume]()
         {
diff --git a/indra/llwebrtc/llwebrtc.h b/indra/llwebrtc/llwebrtc.h
index c6fdb909dd..2deaba9e58 100644
--- a/indra/llwebrtc/llwebrtc.h
+++ b/indra/llwebrtc/llwebrtc.h
@@ -151,6 +151,9 @@ class LLWebRTCDeviceInterface
     virtual void setCaptureDevice(const std::string& id) = 0;
     virtual void setRenderDevice(const std::string& id) = 0;
 
+    virtual bool isCaptureNoDevice() = 0;
+    virtual bool isRenderNoDevice() = 0;
+
     // Device observers for device change callbacks.
     virtual void setDevicesObserver(LLWebRTCDevicesObserver *observer) = 0;
     virtual void unsetDevicesObserver(LLWebRTCDevicesObserver *observer) = 0;
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index b93a1fdb01..27b7eae8e7 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -210,6 +210,9 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS
     void setCaptureDevice(const std::string& id) override;
     void setRenderDevice(const std::string& id) override;
 
+    bool isCaptureNoDevice() override;
+    bool isRenderNoDevice() override;
+
     void setTuningMode(bool enable) override;
     float getTuningAudioLevel() override;
     float getPeerConnectionAudioLevel() override;
@@ -306,9 +309,11 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS
     // accessors in native webrtc for devices aren't apparently implemented yet.
     bool                                                       mTuningMode;
     int32_t                                                    mRecordingDevice;
+    int32_t                                                    mRecordingNoDevice;
     LLWebRTCVoiceDeviceList                                    mRecordingDeviceList;
 
     int32_t                                                    mPlayoutDevice;
+    int32_t                                                    mPlayoutNoDevice;
     LLWebRTCVoiceDeviceList                                    mPlayoutDeviceList;
 
     bool                                                       mMute;
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 60877494e7..e65ba523f0 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -42,7 +42,7 @@
 
 static LLPanelInjector<LLPanelVoiceDeviceSettings> t_panel_group_general("panel_voice_device_settings");
 static const std::string DEFAULT_DEVICE("Default");
-
+static const std::string NO_DEVICE("No Device");
 
 LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
     : LLPanel()
@@ -51,12 +51,10 @@ LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
     mCtrlOutputDevices = NULL;
     mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
     mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
-    mDevicesUpdated = false;  //obsolete
     mUseTuningMode = true;
 
     // grab "live" mic volume level
     mMicVolume = gSavedSettings.getF32("AudioLevelMic");
-
 }
 
 LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings()
@@ -81,7 +79,7 @@ bool LLPanelVoiceDeviceSettings::postBuild()
         boost::bind(&LLPanelVoiceDeviceSettings::onCommitUnmute, this));
 
     mLocalizedDeviceNames[DEFAULT_DEVICE]               = getString("default_text");
-    mLocalizedDeviceNames["No Device"]                  = getString("name_no_device");
+    mLocalizedDeviceNames[NO_DEVICE]                    = getString("name_no_device");
     mLocalizedDeviceNames["Default System Device"]      = getString("name_default_system_device");
 
     mCtrlOutputDevices->setMouseDownCallback(boost::bind(&LLPanelVoiceDeviceSettings::onOutputDevicesClicked, this));
@@ -115,7 +113,7 @@ void LLPanelVoiceDeviceSettings::draw()
     bool voice_enabled = LLVoiceClient::getInstance()->voiceEnabled();
     if (voice_enabled)
     {
-        getChildView("wait_text")->setVisible( !is_in_tuning_mode && mUseTuningMode);
+        getChildView("wait_text")->setVisible(!is_in_tuning_mode && mUseTuningMode);
         getChildView("disabled_text")->setVisible(false);
         mUnmuteBtn->setVisible(false);
     }
@@ -212,56 +210,29 @@ void LLPanelVoiceDeviceSettings::cancel()
 
 void LLPanelVoiceDeviceSettings::refresh()
 {
-    //grab current volume
+    LLVoiceClient* voice_client = LLVoiceClient::getInstance();
+
+    // grab current volume
     LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+
     // set mic volume tuning slider based on last mic volume setting
     F32 current_volume = (F32)volume_slider->getValue().asReal();
-    LLVoiceClient::getInstance()->tuningSetMicVolume(current_volume);
+    voice_client->tuningSetMicVolume(current_volume);
 
     // Fill in popup menus
-    bool device_settings_available = LLVoiceClient::getInstance()->deviceSettingsAvailable();
+    bool device_settings_available = voice_client->deviceSettingsAvailable();
+    bool device_settings_updated = voice_client->deviceSettingsUpdated();
 
     if (mCtrlInputDevices)
     {
-        mCtrlInputDevices->setEnabled(device_settings_available);
-    }
-
-    if (mCtrlOutputDevices)
-    {
-        mCtrlOutputDevices->setEnabled(device_settings_available);
-    }
-
-    getChild<LLSlider>("mic_volume_slider")->setEnabled(device_settings_available);
-
-    if(!device_settings_available)
-    {
-        // The combo boxes are disabled, since we can't get the device settings from the daemon just now.
-        // Put the currently set default (ONLY) in the box, and select it.
-        if(mCtrlInputDevices)
-        {
-            mCtrlInputDevices->removeall();
-            mCtrlInputDevices->add(getLocalizedDeviceName(mInputDevice), mInputDevice, ADD_BOTTOM);
-            mCtrlInputDevices->setValue(mInputDevice);
-        }
-        if(mCtrlOutputDevices)
-        {
-            mCtrlOutputDevices->removeall();
-            mCtrlOutputDevices->add(getLocalizedDeviceName(mOutputDevice), mOutputDevice, ADD_BOTTOM);
-            mCtrlOutputDevices->setValue(mOutputDevice);
-        }
-    }
-    else if (LLVoiceClient::getInstance()->deviceSettingsUpdated())
-    {
-        LLVoiceDeviceList::const_iterator device;
-
-        if(mCtrlInputDevices)
+        if (device_settings_available && !voice_client->getCaptureDevices().empty())
         {
-            LLVoiceDeviceList devices = LLVoiceClient::getInstance()->getCaptureDevices();
-            if (devices.size() > 0) // if zero, we've not received our devices yet
+            mCtrlInputDevices->setEnabled(true);
+            if (device_settings_updated)
             {
                 mCtrlInputDevices->removeall();
                 mCtrlInputDevices->add(getLocalizedDeviceName(DEFAULT_DEVICE), DEFAULT_DEVICE, ADD_BOTTOM);
-                for (auto& device : devices)
+                for (auto& device : voice_client->getCaptureDevices())
                 {
                     mCtrlInputDevices->add(getLocalizedDeviceName(device.display_name), device.full_name, ADD_BOTTOM);
                 }
@@ -275,16 +246,24 @@ void LLPanelVoiceDeviceSettings::refresh()
                 }
             }
         }
+        else
+        {
+            mCtrlInputDevices->setEnabled(false);
+            mCtrlInputDevices->removeall();
+            mCtrlInputDevices->setLabel(getLocalizedDeviceName(NO_DEVICE));
+        }
+    }
 
-        if(mCtrlOutputDevices)
+    if (mCtrlOutputDevices)
+    {
+        if (device_settings_available && !voice_client->getRenderDevices().empty())
         {
-            LLVoiceDeviceList devices = LLVoiceClient::getInstance()->getRenderDevices();
-            if (devices.size() > 0)  // if zero, we've not received our devices yet
+            mCtrlOutputDevices->setEnabled(true);
+            if (device_settings_updated)
             {
                 mCtrlOutputDevices->removeall();
                 mCtrlOutputDevices->add(getLocalizedDeviceName(DEFAULT_DEVICE), DEFAULT_DEVICE, ADD_BOTTOM);
-
-                for (auto& device : devices)
+                for (auto& device : voice_client->getRenderDevices())
                 {
                     mCtrlOutputDevices->add(getLocalizedDeviceName(device.display_name), device.full_name, ADD_BOTTOM);
                 }
@@ -298,7 +277,15 @@ void LLPanelVoiceDeviceSettings::refresh()
                 }
             }
         }
+        else
+        {
+            mCtrlOutputDevices->setEnabled(false);
+            mCtrlOutputDevices->removeall();
+            mCtrlOutputDevices->setLabel(getLocalizedDeviceName(NO_DEVICE));
+        }
     }
+
+    getChild<LLSlider>("mic_volume_slider")->setEnabled(device_settings_available && !voice_client->getCaptureDevices().empty());
 }
 
 void LLPanelVoiceDeviceSettings::initialize()
diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h
index 815396cbd1..d0d14c212c 100644
--- a/indra/newview/llpanelvoicedevicesettings.h
+++ b/indra/newview/llpanelvoicedevicesettings.h
@@ -63,7 +63,6 @@ protected:
     class LLComboBox        *mCtrlInputDevices;
     class LLComboBox        *mCtrlOutputDevices;
     class LLButton          *mUnmuteBtn;
-    bool mDevicesUpdated;
     bool mUseTuningMode;
     std::map<std::string, std::string> mLocalizedDeviceNames;
 };
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 1a35a71706..243cba6ffd 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -391,12 +391,21 @@ void LLVoiceClient::setRenderDevice(const std::string& name)
     LLWebRTCVoiceClient::getInstance()->setRenderDevice(name);
 }
 
+bool LLVoiceClient::isCaptureNoDevice()
+{
+    return LLWebRTCVoiceClient::getInstance()->isCaptureNoDevice();
+}
+
+bool LLVoiceClient::isRenderNoDevice()
+{
+    return LLWebRTCVoiceClient::getInstance()->isRenderNoDevice();
+}
+
 const LLVoiceDeviceList& LLVoiceClient::getCaptureDevices()
 {
     return LLWebRTCVoiceClient::getInstance()->getCaptureDevices();
 }
 
-
 const LLVoiceDeviceList& LLVoiceClient::getRenderDevices()
 {
     return LLWebRTCVoiceClient::getInstance()->getRenderDevices();
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index d53f512d82..2731b0cc7f 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -192,6 +192,9 @@ public:
     virtual LLVoiceDeviceList& getCaptureDevices()=0;
     virtual LLVoiceDeviceList& getRenderDevices()=0;
 
+    virtual bool isCaptureNoDevice() = 0;
+    virtual bool isRenderNoDevice() = 0;
+
     virtual void getParticipantList(std::set<LLUUID> &participants)=0;
     virtual bool isParticipant(const LLUUID& speaker_id)=0;
     //@}
@@ -392,6 +395,8 @@ public:
 
     void setCaptureDevice(const std::string& name);
     void setRenderDevice(const std::string& name);
+    bool isCaptureNoDevice();
+    bool isRenderNoDevice();
     void setHidden(bool hidden);
 
     const LLVoiceDeviceList& getCaptureDevices();
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index bd0419f4dd..b8ddc1f255 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2775,6 +2775,7 @@ void LLVivoxVoiceClient::setCaptureDevice(const std::string& name)
         }
     }
 }
+
 void LLVivoxVoiceClient::setDevicesListUpdated(bool state)
 {
     mDevicesListUpdated = state;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 3167705528..cec8b71442 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -121,6 +121,9 @@ public:
     void setCaptureDevice(const std::string& name) override;
     void setRenderDevice(const std::string& name) override;
 
+    bool isCaptureNoDevice() override { return false; };
+    bool isRenderNoDevice() override { return false; };
+
     LLVoiceDeviceList& getCaptureDevices() override;
     LLVoiceDeviceList& getRenderDevices() override;
     //@}
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index dbeccb51d8..15f3e02634 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -203,6 +203,7 @@ LLWebRTCVoiceClient::LLWebRTCVoiceClient() :
     mTuningMode(false),
     mTuningMicGain(0.0),
     mTuningSpeakerVolume(50),  // Set to 50 so the user can hear themselves when he sets his mic volume
+    mDeviceSettingsAvailable(false),
     mDevicesListUpdated(false),
 
     mSpatialCoordsDirty(false),
@@ -640,12 +641,14 @@ void LLWebRTCVoiceClient::leaveAudioSession()
 void LLWebRTCVoiceClient::clearCaptureDevices()
 {
     LL_DEBUGS("Voice") << "called" << LL_ENDL;
+    mDeviceSettingsAvailable = false;
     mCaptureDevices.clear();
 }
 
 void LLWebRTCVoiceClient::addCaptureDevice(const LLVoiceDevice& device)
 {
     LL_INFOS("Voice") << "Voice Capture Device: '" << device.display_name << "' (" << device.full_name << ")" << LL_ENDL;
+    mDeviceSettingsAvailable = false;
     mCaptureDevices.push_back(device);
 }
 
@@ -658,6 +661,7 @@ void LLWebRTCVoiceClient::setCaptureDevice(const std::string& name)
 {
     mWebRTCDeviceInterface->setCaptureDevice(name);
 }
+
 void LLWebRTCVoiceClient::setDevicesListUpdated(bool state)
 {
     mDevicesListUpdated = state;
@@ -703,20 +707,22 @@ void LLWebRTCVoiceClient::OnDevicesChangedImpl(const llwebrtc::LLWebRTCVoiceDevi
     }
     setCaptureDevice(inputDevice);
 
+    mDeviceSettingsAvailable = true;
     setDevicesListUpdated(true);
 }
 
 void LLWebRTCVoiceClient::clearRenderDevices()
 {
     LL_DEBUGS("Voice") << "called" << LL_ENDL;
+    mDeviceSettingsAvailable = false;
     mRenderDevices.clear();
 }
 
 void LLWebRTCVoiceClient::addRenderDevice(const LLVoiceDevice& device)
 {
     LL_INFOS("Voice") << "Voice Render Device: '" << device.display_name << "' (" << device.full_name << ")" << LL_ENDL;
+    mDeviceSettingsAvailable = false;
     mRenderDevices.push_back(device);
-
 }
 
 LLVoiceDeviceList& LLWebRTCVoiceClient::getRenderDevices()
@@ -729,6 +735,16 @@ void LLWebRTCVoiceClient::setRenderDevice(const std::string& name)
     mWebRTCDeviceInterface->setRenderDevice(name);
 }
 
+bool LLWebRTCVoiceClient::isCaptureNoDevice()
+{
+    return mCaptureDevices.empty() || mWebRTCDeviceInterface->isCaptureNoDevice();
+}
+
+bool LLWebRTCVoiceClient::isRenderNoDevice()
+{
+    return mRenderDevices.empty() || mWebRTCDeviceInterface->isRenderNoDevice();
+}
+
 void LLWebRTCVoiceClient::tuningStart()
 {
     if (!mIsInTuningMode)
@@ -754,11 +770,15 @@ bool LLWebRTCVoiceClient::inTuningMode()
 
 void LLWebRTCVoiceClient::tuningSetMicVolume(float volume)
 {
-    mTuningMicGain      = volume;
+    mTuningMicGain = volume;
 }
 
 void LLWebRTCVoiceClient::tuningSetSpeakerVolume(float volume)
 {
+    if (isRenderNoDevice())
+    {
+        volume = 0;
+    }
 
     if (volume != mTuningSpeakerVolume)
     {
@@ -768,14 +788,17 @@ void LLWebRTCVoiceClient::tuningSetSpeakerVolume(float volume)
 
 float LLWebRTCVoiceClient::getAudioLevel()
 {
-    if (mIsInTuningMode)
+    if (isCaptureNoDevice())
     {
-        return (1.0f - mWebRTCDeviceInterface->getTuningAudioLevel() * LEVEL_SCALE_WEBRTC) * mTuningMicGain / 2.1f;
+        return 0;
     }
-    else
+
+    if (mIsInTuningMode)
     {
-        return (1.0f - mWebRTCDeviceInterface->getPeerConnectionAudioLevel() * LEVEL_SCALE_WEBRTC) * mMicGain / 2.1f;
+        return (1.0f - mWebRTCDeviceInterface->getTuningAudioLevel() * LEVEL_SCALE_WEBRTC) * mTuningMicGain / 2.1f;
     }
+
+    return (1.0f - mWebRTCDeviceInterface->getPeerConnectionAudioLevel() * LEVEL_SCALE_WEBRTC) * mMicGain / 2.1f;
 }
 
 float LLWebRTCVoiceClient::tuningGetEnergy(void)
@@ -783,15 +806,6 @@ float LLWebRTCVoiceClient::tuningGetEnergy(void)
     return getAudioLevel();
 }
 
-bool LLWebRTCVoiceClient::deviceSettingsAvailable()
-{
-    bool result = true;
-
-    if(mRenderDevices.empty() || mCaptureDevices.empty())
-        result = false;
-
-    return result;
-}
 bool LLWebRTCVoiceClient::deviceSettingsUpdated()
 {
     bool updated = mDevicesListUpdated;
@@ -801,7 +815,7 @@ bool LLWebRTCVoiceClient::deviceSettingsUpdated()
 
 void LLWebRTCVoiceClient::refreshDeviceLists(bool clearCurrentList)
 {
-    if(clearCurrentList)
+    if (clearCurrentList)
     {
         clearCaptureDevices();
         clearRenderDevices();
@@ -809,7 +823,6 @@ void LLWebRTCVoiceClient::refreshDeviceLists(bool clearCurrentList)
     mWebRTCDeviceInterface->refreshDevices();
 }
 
-
 void LLWebRTCVoiceClient::setHidden(bool hidden)
 {
     mHidden = hidden;
@@ -1523,9 +1536,7 @@ void LLWebRTCVoiceClient::setVoiceVolume(F32 volume)
 {
     if (volume != mSpeakerVolume)
     {
-        {
-            mSpeakerVolume      = volume;
-        }
+        mSpeakerVolume  = volume;
         sessionState::for_each(boost::bind(predSetSpeakerVolume, _1, volume));
     }
 }
@@ -1544,7 +1555,6 @@ void LLWebRTCVoiceClient::setMicGain(F32 gain)
     }
 }
 
-
 void LLWebRTCVoiceClient::setVoiceEnabled(bool enabled)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE;
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index 930018b123..88ead98950 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -114,7 +114,7 @@ public:
     /// @name Devices
     //@{
     // This returns true when it's safe to bring up the "device settings" dialog in the prefs.
-    bool deviceSettingsAvailable() override;
+    bool deviceSettingsAvailable() override { return mDeviceSettingsAvailable; }
     bool deviceSettingsUpdated() override;  //return if the list has been updated and never fetched,  only to be called from the voicepanel.
 
     // Requery the WebRTC daemon for the current list of input/output devices.
@@ -126,6 +126,9 @@ public:
     void setCaptureDevice(const std::string& name) override;
     void setRenderDevice(const std::string& name) override;
 
+    bool isCaptureNoDevice() override;
+    bool isRenderNoDevice() override;
+
     LLVoiceDeviceList& getCaptureDevices() override;
     LLVoiceDeviceList& getRenderDevices() override;
     //@}
@@ -462,8 +465,9 @@ private:
     bool mTuningMode;
     F32 mTuningMicGain;
     int mTuningSpeakerVolume;
+    bool mDeviceSettingsAvailable;
     bool mDevicesListUpdated;            // set to true when the device list has been updated
-                                        // and false when the panelvoicedevicesettings has queried for an update status.
+                                         // and false when the panelvoicedevicesettings has queried for an update status.
     std::string mSpatialSessionCredentials;
 
     std::string mMainSessionGroupHandle; // handle of the "main" session group.