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, 15 insertions, 0 deletions

diff --git a/linden/indra/newview/impprefsfonts.cpp b/linden/indra/newview/impprefsfonts.cpp
index a4dcd34..505761b 100644
--- a/linden/indra/newview/impprefsfonts.cpp
+++ b/linden/indra/newview/impprefsfonts.cpp
@@ -51,6 +51,10 @@ ImpPrefsFonts::~ImpPrefsFonts()
 
 BOOL ImpPrefsFonts::postBuild()
 {
+        childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
+        childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale"));
+        childSetAction("reset_ui_size", onClickResetUISize, this);
+
         refresh();
         return true;
 }
@@ -79,6 +83,9 @@ void ImpPrefsFonts::refresh()
 
 void ImpPrefsFonts::apply()
 {
+        gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
+        gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
+
         bool changed = false;
 
         LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
@@ -126,3 +133,11 @@ void ImpPrefsFonts::apply()
 void ImpPrefsFonts::cancel()
 {
 }
+
+// static
+void ImpPrefsFonts::onClickResetUISize(void* user_data)
+{
+        ImpPrefsFonts* self = (ImpPrefsFonts*)user_data;
+        F32 def = gSavedSettings.getControl("UIScaleFactor")->getDefault().asReal();
+        self->childSetValue("ui_scale_slider", def);
+}