Besides the numerous label and organizational changes, here are the main points

* Moved numerous options out of the Advanced panel
* Moved numerous options out of the General panel
* Combined the Network and Web Browser panels
* Combined IM, Chat, and Spell checking preferences
* Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting
* Removed UI for 'hide my own group title'. This can still be set in the debug settings
* Renamed Popups > Notifications
* Renamed Chat Colors > Colors
* Renamed 'IMs and Logging' to 'Logging and Privacy'
* Moved Colors next to Skins
* Added style guide to the top of every preferences panel xui

1 files changed, 6 insertions, 19 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 52192b8..d518eac 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -60,7 +60,6 @@
 #include "llpanellogin.h"
 #include "llpanelLCD.h"
 #include "llpanelmsgs.h"
-#include "llpanelweb.h"
 #include "llpanelskins.h"
 #include "llprefsadvanced.h"
 #include "llprefschat.h"
@@ -151,10 +150,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mNetworkPanel->setDefaultBtn(default_btn);
 
-        mWebPanel = new LLPanelWeb();
-        mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mWebPanel->setDefaultBtn(default_btn);
-
         mDisplayPanel = new LLPanelDisplay();
         mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mDisplayPanel->setDefaultBtn(default_btn);
@@ -167,10 +162,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
         mPrefsChat->getPanel()->setDefaultBtn(default_btn);
 
-        mPrefsColors = new LLPrefsColors();
-        mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mPrefsColors->setDefaultBtn(default_btn);
-
         mPrefsIM = new LLPrefsIM();
         mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
         mPrefsIM->getPanel()->setDefaultBtn(default_btn);
@@ -197,6 +188,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
         mMsgPanel = new LLPanelMsgs();
         mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
         mMsgPanel->setDefaultBtn(default_btn);
+
+        mPrefsColors = new LLPrefsColors();
+        mTabContainer->addTabPanel(mPrefsColors, mPrefsColors->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsColors->setDefaultBtn(default_btn);
         
         mSkinsPanel = new LLPanelSkins();
         mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -259,11 +254,6 @@ LLPreferenceCore::~LLPreferenceCore()
                 delete mMsgPanel;
                 mMsgPanel = NULL;
         }
-        if (mWebPanel)
-        {
-                delete mWebPanel;
-                mWebPanel = NULL;
-        }
         if (mSkinsPanel)
         {
                 delete mSkinsPanel;
@@ -306,7 +296,6 @@ void LLPreferenceCore::apply()
         // hardware menu apply
         LLFloaterHardwareSettings::instance()->apply();
 
-        mWebPanel->apply();
 #if LL_LCD_COMPILE
         // only add this option if we actually have a logitech keyboard / speaker set
         if (gLcdScreen->Enabled())
@@ -314,7 +303,6 @@ void LLPreferenceCore::apply()
                 mLCDPanel->apply();
         }
 #endif
-//      mWebPanel->apply();
 }
 
 
@@ -337,7 +325,6 @@ void LLPreferenceCore::cancel()
         // cancel hardware menu
         LLFloaterHardwareSettings::instance()->cancel();
 
-        mWebPanel->cancel();
 #if LL_LCD_COMPILE
         // only add this option if we actually have a logitech keyboard / speaker set
         if (gLcdScreen->Enabled())
@@ -345,7 +332,6 @@ void LLPreferenceCore::cancel()
                 mLCDPanel->cancel();
         }
 #endif
-//      mWebPanel->cancel();
 }
 
 // static
@@ -359,7 +345,8 @@ void LLPreferenceCore::onTabChanged(void* user_data, bool from_click)
 
 void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
-        mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
+        mPrefsIM->setPersonalInfo(visibility);
+        mPrefsChat->setPersonalInfo(im_via_email, email);
 }
 
 void LLPreferenceCore::updateIsLoggedIn(bool enable)