1 files changed, 8 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index f7392c4..0b3e856 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -54,6 +54,7 @@
 #include "llpanelmsgs.h"
 #include "llpanelweb.h"
 #include "llprefschat.h"
+#include "llprefsvoice.h"
 #include "llprefsim.h"
 #include "llresizehandle.h"
 #include "llresmgr.h"
@@ -144,6 +145,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
         mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
         mPrefsChat->getPanel()->setDefaultBtn(default_btn);
 
+        mPrefsVoice = new LLPrefsVoice();
+        mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsVoice->setDefaultBtn(default_btn);
+
         mPrefsIM = new LLPrefsIM();
         mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
         mPrefsIM->getPanel()->setDefaultBtn(default_btn);
@@ -225,8 +230,8 @@ void LLPreferenceCore::apply()
         mDisplayPanel->apply();
         mDisplayPanel2->apply();
         mDisplayPanel3->apply();
-        mAudioPanel->apply();
         mPrefsChat->apply();
+        mPrefsVoice->apply();
         mPrefsIM->apply();
         mMsgPanel->apply();
         #if LL_LIBXUL_ENABLED
@@ -245,6 +250,7 @@ void LLPreferenceCore::cancel()
         mDisplayPanel3->cancel();
         mAudioPanel->cancel();
         mPrefsChat->cancel();
+        mPrefsVoice->cancel();
         mPrefsIM->cancel();
         mMsgPanel->cancel();
         #if LL_LIBXUL_ENABLED
@@ -388,7 +394,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
         if (fp->canClose())
         {
                 fp->apply();
-                fp->onClose(false);
+                fp->close(false);
 
                 gSavedSettings.saveToFile( gSettingsFileName, TRUE );