Second Life viewer sources 1.18.2.0

1 files changed, 15 insertions, 17 deletions

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index c66a3d0..c5788d6 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -149,7 +149,7 @@ void LLPrefsVoiceLogic::onEarLocationCommit(LLUICtrl* ctrl, void* user_data)
 }
 
 //static
-void LLPrefsVoiceLogic::onClickLaunchWizard(void* user_data)

+void LLPrefsVoiceLogic::onClickLaunchWizard(void* user_data)
 {
         LLFloaterVoiceWizard::showInstance();
 }
@@ -231,10 +231,8 @@ LLPrefsVoice::LLPrefsVoice()
         childSetAction("device_settings_btn", onClickDeviceSettingsBtn, this);
 
         // create floater immediately and keep it hidden
-        // since it stores preference state for audio devices

-        mDeviceSettings = LLFloaterDeviceSettings::getInstance();

-        //*FIXME: getInstance() needs to not show the floater

-        LLFloaterDeviceSettings::hideInstance();

+        // since it stores preference state for audio devices
+        mDeviceSettings = LLFloaterDeviceSettings::getInstance();
 }
 
 LLPrefsVoice::~LLPrefsVoice()
@@ -263,15 +261,15 @@ void LLPrefsVoice::cancel()
         mLogic->cancel();
         mDeviceSettings->cancel();
 }
-

-//static 

-void LLPrefsVoice::onClickDeviceSettingsBtn(void* user_data)

-{

-        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;

-        prefs->mDeviceSettings->open();

-        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);

-        if (parent_floater)

-        {

-                parent_floater->addDependentFloater(prefs->mDeviceSettings, FALSE);

-        }

-}

+
+//static 
+void LLPrefsVoice::onClickDeviceSettingsBtn(void* user_data)
+{
+        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
+        prefs->mDeviceSettings->open();
+        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
+        if (parent_floater)
+        {
+                parent_floater->addDependentFloater(prefs->mDeviceSettings, FALSE);
+        }
+}