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, 30 insertions, 41 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 80eb65a..e149c41 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1004,6 +1004,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>ShowTimestamps</key>
+  <map>
+    <key>Comment</key>
+    <string>Show timestamps in chat and IMs</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>SpeedRez</key>
   <map>
     <key>Comment</key>
@@ -1038,7 +1049,7 @@
     <integer>1</integer>
   </map>
   <key>RenderWaterVoidCulling</key>
-    <map>
+  <map>
     <key>Comment</key>
     <string>Cull void water objects when off-screen.</string>
     <key>Persist</key>
@@ -1060,16 +1071,16 @@
     <integer>0</integer>
   </map>
   <key>ResetFocusOnSelfClick</key>
-                <map>
-                <key>Comment</key>
-                <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
-                <key>Persist</key>
-                <integer>1</integer>
-                <key>Type</key>
-                <string>Boolean</string>
-                <key>Value</key>
-                <integer>1</integer>
-                </map>
+  <map>
+    <key>Comment</key>
+    <string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>RezWithLandGroup</key>
   <map>
     <key>Comment</key>
@@ -1513,7 +1524,7 @@
   </map>
 
   <!-- Begin: OpenRegionInfo -->
-  
+
   <key>ToggleTeenMode</key>
   <map>
     <key>Comment</key>
@@ -1525,7 +1536,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <!-- Begin: AO-->
 
   <key>AOEnabled</key>
@@ -1776,7 +1787,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <key>DownloadClientTags</key>
   <map>
     <key>Comment</key>
@@ -2131,9 +2142,9 @@
     <key>Value</key>
     <string>English (United States of America)</string>
   </map>
-  
+
   <!-- End: Spellcheck & Translation -->
-  
+
   <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
@@ -2314,7 +2325,7 @@
   </map>
 
   <!-- End: RLVa -->
-  
+
   <!-- Begin: socks5 -->
 
   <key>Socks5ProxyEnabled</key>
@@ -2525,11 +2536,11 @@
     <key>Value</key>
     <integer>-8888888</integer>
   </map>
-  
+
   <!-- End: full radar (Advanced menu) -->
 
   <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
-  
+
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3944,17 +3955,6 @@
     <key>Value</key>
     <real>20.0</real>
   </map>
-  <key>ChatShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in chat</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>ChatVisible</key>
   <map>
     <key>Comment</key>
@@ -7413,17 +7413,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>IMShowTimestamps</key>
-  <map>
-    <key>Comment</key>
-    <string>Show timestamps in IM</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>IgnorePixelDepth</key>
   <map>
     <key>Comment</key>