Second Life viewer sources 1.19.1.0

1 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/llfloatervoicewizard.h b/linden/indra/newview/llfloatervoicewizard.h
index 9b1a1a0..a70677d 100644
--- a/linden/indra/newview/llfloatervoicewizard.h
+++ b/linden/indra/newview/llfloatervoicewizard.h
@@ -39,7 +39,7 @@ class LLPrefsVoiceLogic;
 class LLPanelDeviceSettings;
 
 class LLFloaterVoiceWizard 
-: public LLFloater, public LLUISingleton<LLFloaterVoiceWizard>
+        : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceWizard>
 {
 public:
         LLFloaterVoiceWizard(const LLSD& seed);
@@ -84,12 +84,12 @@ protected:
         F32 mMicVolume;
         std::string mInputDevice;
         std::string mOutputDevice;
-        LLComboBox              *mCtrlInputDevices;
-        LLComboBox              *mCtrlOutputDevices;
+        class LLComboBox                *mCtrlInputDevices;
+        class LLComboBox                *mCtrlOutputDevices;
         BOOL mDevicesUpdated;
 };
 
-class LLFloaterDeviceSettings : public LLFloater, public LLUISingleton<LLFloaterDeviceSettings>
+class LLFloaterDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterDeviceSettings>
 {
 public:
         LLFloaterDeviceSettings(const LLSD& seed);