From d7ac52afd74175da12d56a8c0412f19edfd5afe3 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 2 Aug 2013 16:52:36 -0400
Subject: [PATCH] Fix MyBrains Gottfried's issue of device settings switching
 to default device on apply

---
 indra/newview/llpanelvoicedevicesettings.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index f890e55f8..883d44ecc 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -70,7 +70,11 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()
 	volume_slider->setValue(mMicVolume);
 
 	mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
+	mCtrlInputDevices->add(getLocalizedDeviceName(mInputDevice), mInputDevice);
+	mCtrlInputDevices->setValue(mInputDevice);
 	mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
+	mCtrlOutputDevices->add(getLocalizedDeviceName(mOutputDevice), mOutputDevice);
+	mCtrlOutputDevices->setValue(mOutputDevice);
 
 	mCtrlInputDevices->setCommitCallback(
 		boost::bind(&LLPanelVoiceDeviceSettings::onCommitInputDevice, this));