diff options
| author | Adam Moss <moss@lindenlab.com> | 2007-05-26 00:50:37 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2007-05-26 00:50:37 +0000 |
| commit | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (patch) | |
| tree | 10bef504a44f839d7150a3dee4a57e0883b018e7 /indra/newview/llfloaterpreference.cpp | |
| parent | 029130bf9c76139fa836117987b60e801ac7ec7c (diff) | |
land mozilla-https-fix branch, -> release
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b5b3343103..d7717dffc3 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -32,7 +32,7 @@ #include "llpanelgeneral.h" #include "llpanelinput.h" #include "llpanelmsgs.h" -//#include "llpanelweb.h" +#include "llpanelweb.h" #include "llprefschat.h" #include "llprefsim.h" #include "llresizehandle.h" @@ -43,7 +43,6 @@ #include "llviewernetwork.h" #include "llvieweruictrlfactory.h" #include "llviewerwindow.h" -//#include "viewer.h" #include "llkeyboard.h" #include "llscrollcontainer.h" @@ -99,6 +98,12 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer); mNetworkPanel->setDefaultBtn(default_btn); + #if LL_LIBXUL_ENABLED + mWebPanel = new LLPanelWeb(); + mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer); + mWebPanel->setDefaultBtn(default_btn); + #endif + mDisplayPanel = new LLPanelDisplay(); mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer); mDisplayPanel->setDefaultBtn(default_btn); @@ -129,11 +134,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton mMsgPanel->setDefaultBtn(default_btn); mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")); - -// Web prefs removed from Loopy build -// mWebPanel = new LLPanelWeb(); -// gUICtrlFactory->buildPanel(mWebPanel, "panel_settings_web.xml"); -// addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this); } LLPreferenceCore::~LLPreferenceCore() @@ -188,11 +188,13 @@ LLPreferenceCore::~LLPreferenceCore() delete mMsgPanel; mMsgPanel = NULL; } - //if (mWebPanel) - //{ - // delete mWebPanel; - // mWebPanel = NULL; - //} + #if LL_LIBXUL_ENABLED + if (mWebPanel) + { + delete mWebPanel; + mWebPanel = NULL; + } + #endif } @@ -208,7 +210,9 @@ void LLPreferenceCore::apply() mPrefsChat->apply(); mPrefsIM->apply(); mMsgPanel->apply(); -// mWebPanel->apply(); + #if LL_LIBXUL_ENABLED + mWebPanel->apply(); + #endif } @@ -224,7 +228,9 @@ void LLPreferenceCore::cancel() mPrefsChat->cancel(); mPrefsIM->cancel(); mMsgPanel->cancel(); -// mWebPanel->cancel(); + #if LL_LIBXUL_ENABLED + mWebPanel->cancel(); + #endif } // static |