Second Life viewer sources 1.20.2

1 files changed, 11 insertions, 37 deletions

diff --git a/linden/indra/newview/llfloatervoicewizard.h b/linden/indra/newview/llfloatervoicedevicesettings.h
index a70677d..eba5c3c 100644
--- a/linden/indra/newview/llfloatervoicewizard.h
+++ b/linden/indra/newview/llfloatervoicedevicesettings.h
@@ -1,5 +1,5 @@
 /** 
- * @file llfloatervoicewizard.h
+ * @file llpanelvoicedevicesettings.h
  * @author Richard Nelson
  * @brief Voice communication set-up wizard
  *
@@ -30,44 +30,18 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLFLOATERVOICEWIZARD_H
-#define LL_LLFLOATERVOICEWIZARD_H
+#ifndef LL_LLFLOATERVOICEDEVICESETTINGS_H
+#define LL_LLFLOATERVOICEDEVICESETTINGS_H
 
 #include "llfloater.h"
 
 class LLPrefsVoiceLogic;
-class LLPanelDeviceSettings;
 
-class LLFloaterVoiceWizard 
-        : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceWizard>
+class LLPanelVoiceDeviceSettings : public LLPanel
 {
 public:
-        LLFloaterVoiceWizard(const LLSD& seed);
-        virtual ~LLFloaterVoiceWizard();
-
-        /*virtual*/ BOOL postBuild();
-        /*virtual*/ void draw();
-        /*virtual*/ void onOpen();
-        /*virtual*/ void onClose(bool app_quitting);
-
-protected:
-        static void onClickNext(void *user_data);
-        static void onClickBack(void *user_data);
-        static void onClickOK(void *user_data);
-        static void onClickCancel(void *user_data);
-        static void onCommitVoiceEnable(LLUICtrl* ctrl, void* user_data);
-        static void* createPanelDeviceSettings(void* user_data);
-
-protected:
-        LLPrefsVoiceLogic* mLogic;
-        LLPanelDeviceSettings* mDevicePanel;
-};
-
-class LLPanelDeviceSettings : public LLPanel
-{
-public:
-        LLPanelDeviceSettings();
-        ~LLPanelDeviceSettings();
+        LLPanelVoiceDeviceSettings();
+        ~LLPanelVoiceDeviceSettings();
 
         /*virtual*/ void draw();
         /*virtual*/ BOOL postBuild();
@@ -89,10 +63,10 @@ protected:
         BOOL mDevicesUpdated;
 };
 
-class LLFloaterDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterDeviceSettings>
+class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceDeviceSettings>
 {
 public:
-        LLFloaterDeviceSettings(const LLSD& seed);
+        LLFloaterVoiceDeviceSettings(const LLSD& seed);
         /*virtual*/ void onOpen();
         /*virtual*/ void onClose(bool app_quitting);
         /*virtual*/ void draw();
@@ -100,9 +74,9 @@ public:
         void cancel();
 
 protected:
-        static void* createPanelDeviceSettings(void* user_data);
+        static void* createPanelVoiceDeviceSettings(void* user_data);
 
-        LLPanelDeviceSettings* mDevicePanel;
+        LLPanelVoiceDeviceSettings* mDevicePanel;
 };
 
-#endif // LL_LLFLOATERVOICEWIZARD_H
+#endif // LL_LLFLOATERVOICEDEVICESETTINGS_H