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, 4 insertions, 7 deletions

diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index d7727e7..e64e9ba 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -113,14 +113,13 @@ protected:
         LLCheckBoxCtrl  *mCtrlShaderEnable;
         LLCheckBoxCtrl  *mCtrlAvatarImpostors;
         LLCheckBoxCtrl  *mCtrlAvatarCloth;
-        LLRadioGroup    *mRadioLightingDetail2;
+        LLComboBox              *mComboLightingDetail;
 
-        LLRadioGroup    *mRadioTerrainDetail;
-        LLRadioGroup    *mRadioReflectionDetail;
+        LLComboBox              *mComboTerrainDetail;
+        LLComboBox              *mComboReflectionDetail;
 
         LLTextBox               *mAspectRatioLabel1;
         LLTextBox               *mDisplayResLabel;
-        LLTextEditor    *mFullScreenInfo;
         LLTextBox       *mWindowSizeLabel;
         
         LLTextBox               *mShaderText;
@@ -137,7 +136,7 @@ protected:
         LLTextBox               *mTerrainFactorText;
         LLTextBox               *mSkyFactorText;
         LLTextBox               *mPostProcessText;
-        LLTextBox               *mAvatarCountText;
+        LLTextBox               *mLimitsText;
 
         BOOL mFSAutoDetectAspect;
         F32 mAspectRatio;
@@ -173,8 +172,6 @@ protected:
 
         S32 mAvatarMaxVisible;
 
-        BOOL mWLControl;
-
         static void setGraphicsSettings(LLControlGroup& group);
         static void createGroup();