svn merge -r 83778:83944 maint-ui-10-merge

QAR-442

1 files changed, 82 insertions, 0 deletions

diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h
new file mode 100644
index 0000000000..45a209b24b
--- /dev/null
+++ b/indra/newview/llfloatervoicedevicesettings.h
@@ -0,0 +1,82 @@
+/** 
+ * @file llpanelvoicedevicesettings.h
+ * @author Richard Nelson
+ * @brief Voice communication set-up wizard
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERVOICEDEVICESETTINGS_H
+#define LL_LLFLOATERVOICEDEVICESETTINGS_H
+
+#include "llfloater.h"
+
+class LLPrefsVoiceLogic;
+
+class LLPanelVoiceDeviceSettings : public LLPanel
+{
+public:
+	LLPanelVoiceDeviceSettings();
+	~LLPanelVoiceDeviceSettings();
+
+	/*virtual*/ void draw();
+	/*virtual*/ BOOL postBuild();
+	void apply();
+	void cancel();
+	void refresh();
+	void onOpen();
+	void onClose(bool app_quitting);
+
+protected:
+	static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data);
+	static void onCommitOutputDevice(LLUICtrl* ctrl, void* user_data);
+
+	F32 mMicVolume;
+	std::string mInputDevice;
+	std::string mOutputDevice;
+	class LLComboBox		*mCtrlInputDevices;
+	class LLComboBox		*mCtrlOutputDevices;
+	BOOL mDevicesUpdated;
+};
+
+class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceDeviceSettings>
+{
+public:
+	LLFloaterVoiceDeviceSettings(const LLSD& seed);
+	/*virtual*/ void onOpen();
+	/*virtual*/ void onClose(bool app_quitting);
+	/*virtual*/ void draw();
+	void apply();
+	void cancel();
+
+protected:
+	static void* createPanelVoiceDeviceSettings(void* user_data);
+
+	LLPanelVoiceDeviceSettings* mDevicePanel;
+};
+
+#endif // LL_LLFLOATERVOICEDEVICESETTINGS_H