Moved base up to 1.22

1 files changed, 9 insertions, 40 deletions

diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index 836108d..fa48395 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -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