From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 1 Dec 2008 17:39:58 -0600
Subject: Second Life viewer sources 1.22.0-RC

---
 linden/indra/newview/llprefsvoice.h | 47 +++++++------------------------------
 1 file changed, 8 insertions(+), 39 deletions(-)

(limited to 'linden/indra/newview/llprefsvoice.h')

diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index 836108d..a7cba73 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -34,55 +34,24 @@
 
 #include "llpanel.h"
 
-class LLFloaterVoiceDeviceSettings;
-
-class LLPrefsVoiceLogic
-{
-public:
-	LLPrefsVoiceLogic(LLPanel* panelp);
-	virtual ~LLPrefsVoiceLogic(){};
-	
-	virtual void init();
-
-	void apply();
-	void cancel();
-	void refresh();
-	
-	void setKey(KEY key, MASK mask);
-
-protected:
-
-	static void onClickSetKey(void* user_data);
-	static void onClickSetMiddleMouse(void* user_data);
-	static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
-
-	BOOL mEnableVoice;
-	BOOL mVoiceCallsFriendsOnly;
-	std::string mModifier;
-	BOOL mPushToTalkToggle;
-	S32  mEarLocation;
-	LLCtrlSelectionInterface	*mCtrlEarLocation;
-	
-	BOOL mEatNextSetKeyClick;
-
-	LLPanel* mPanel;
-};
-
 class LLPrefsVoice : public LLPanel
 {
 public:
 	LLPrefsVoice();
 	~LLPrefsVoice();
 
-	/*virtual*/ void draw();
+	BOOL postBuild();
+
 	void apply();
 	void cancel();
 
-protected:
-	static void onClickVoiceDeviceSettingsBtn(void* user_data);
+	void setKey(KEY key);
 
-	LLPrefsVoiceLogic* mLogic;
-	LLFloaterVoiceDeviceSettings* mVoiceDeviceSettings;
+private:
+	static void onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data);
+	static void onClickSetKey(void* user_data);
+	static void onClickSetMiddleMouse(void* user_data);
+	static void onClickVoiceDeviceSettings(void* user_data);
 };
 
 #endif // LLPREFSVOICE_H
-- 
cgit v1.1