1 files changed, 14 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 17a59cc..c468a5e 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -62,6 +62,7 @@
 #include "llpanelmsgs.h"
 #include "llpanelweb.h"
 #include "llpanelskins.h"
+#include "llprefsadvanced.h"
 #include "llprefschat.h"
 #include "llprefsvoice.h"
 #include "llprefsim.h"
@@ -132,7 +133,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mAudioPanel(NULL),
         mMsgPanel(NULL),
         mSkinsPanel(NULL),
-        mLCDPanel(NULL)
+        mLCDPanel(NULL),
+        mPrefsAdvanced(NULL)
 {
         mGeneralPanel = new LLPanelGeneral();
         mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -192,6 +194,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mSkinsPanel->setDefaultBtn(default_btn);
 
+        mPrefsAdvanced = new LLPrefsAdvanced();
+        mTabContainer->addTabPanel(mPrefsAdvanced, mPrefsAdvanced->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsAdvanced->setDefaultBtn(default_btn);
+
         if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
         {
                 mTabContainer->selectFirstTab();
@@ -251,6 +257,11 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mSkinsPanel;
                 mSkinsPanel = NULL;
         }
+        if (mPrefsAdvanced)
+        {
+                delete mPrefsAdvanced;
+                mPrefsAdvanced = NULL;
+        }
 
 }
 
@@ -267,6 +278,7 @@ void LLPreferenceCore::apply()
         mPrefsIM->apply();
         mMsgPanel->apply();
         mSkinsPanel->apply();
+        mPrefsAdvanced->apply();
 
         // hardware menu apply
         LLFloaterHardwareSettings::instance()->apply();
@@ -295,6 +307,7 @@ void LLPreferenceCore::cancel()
         mPrefsIM->cancel();
         mMsgPanel->cancel();
         mSkinsPanel->cancel();
+        mPrefsAdvanced->cancel();
 
         // cancel hardware menu
         LLFloaterHardwareSettings::instance()->cancel();