SL-16627 Enable auto-adjustments for frist login and update UI

6 files changed, 77 insertions, 31 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 94bafcb612..537b431ea2 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2208,7 +2208,11 @@ bool idle_startup()
 
 	if (STATE_CLEANUP == LLStartUp::getStartupState())
 	{
-		set_startup_status(1.0, "", "");
+        if (gAgent.isFirstLogin())
+        {
+            gSavedSettings.setBOOL("AutoFPS", TRUE);
+        }
+        set_startup_status(1.0, "", "");
 		display_startup();
 
 		if (!mBenefitsSuccessfullyInit)
diff --git a/indra/newview/skins/default/xui/en/floater_performance.xml b/indra/newview/skins/default/xui/en/floater_performance.xml
index 84ee9d3c00..0107c59868 100644
--- a/indra/newview/skins/default/xui/en/floater_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_performance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="592"
+ height="642"
  layout="topleft"
  name="performance"
  save_rect="true"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
index 40159314f7..954fd0a8c1 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_complexity.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_complexity"
  layout="topleft"
@@ -83,7 +83,7 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="379"
+    height="429"
     follows="left|top"
     layout="topleft"
     name="obj_list"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_huds.xml b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
index eea6b79e30..289f865eb7 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_huds.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_huds"
  layout="topleft"
@@ -71,7 +71,7 @@
   <name_list
     column_padding="0"
     draw_stripes="true"
-    height="400"
+    height="450"
     follows="left|top"
     layout="topleft"
     name="hud_list"
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index 5fd6af24c1..1eee799986 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="530"
+ height="580"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -54,13 +54,46 @@
     top_delta="0"
     width="200"/>
   <view_border
-    bevel_style="in"
-    height="0"
-    layout="topleft"
-    name="border1"
-    left="20"
-    top_pad="8"
-    width="540"/>
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border0"
+   top_pad="8"
+   left="20"
+   width="540"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   text_color="White"
+   height="18"
+   layout="topleft"
+   top_pad="20"
+   left="20"
+   name="auto_lbl"
+   width="105">
+    Automatic settings
+  </text>
+  <check_box
+   control_name="AutoFPS"
+   height="16"
+   initial_value="true"
+   label="Allow system to choose settings for best experience"
+   label_text.text_color="White"
+   label_text.v_pad="-1"
+   label_text.h_pad="3"
+   layout="topleft"
+   left_pad="30"
+   name="AutoFPS"
+   width="256">
+  </check_box>
+  <view_border
+   bevel_style="in"
+   height="0"
+   layout="topleft"
+   name="border1"
+   left="20"
+   top_pad="12"
+   width="540"/>
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -70,7 +103,7 @@
    top_pad="30"
    name="quality_lbl"
    width="100">
-    Shortcuts
+    Quality &amp; Speed
   </text>
   <text
    follows="left|top"
@@ -362,7 +395,7 @@
    top_delta="0"
    left="160"
    name="water_desc"
-   width="350">
+   width="380">
     Reducing or turning off water effects can greatly improve frame rate.
   </text>
   <check_box
@@ -487,7 +520,7 @@
    font="SansSerifSmall"
    height="18"
    layout="topleft"
-   top="78"
+   top="130"
    left="213"
    name="1_lbl"
    width="7">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f73149e77e..93cb3ea9c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -30,7 +30,28 @@
     width="120">
       (None)
   </text>
-
+  <view_border
+    bevel_style="in"
+    height="0"
+    layout="topleft"
+    name="border1"
+    left="12"
+    top_pad="12"
+    width="477"/>
+  <check_box
+    control_name="AutoFPS"
+    height="16"
+    initial_value="true"
+    label="Allow system to choose settings for best experience"
+    label_text.text_color="White"
+    label_text.v_pad="-1"
+    label_text.h_pad="5"
+    layout="topleft"
+    left="10"
+    name="AutoFPS"
+    top_delta="15"
+    width="256">
+  </check_box>
   <text
     type="string"
     length="1"
@@ -39,7 +60,7 @@
     layout="topleft"
     left="10"
     name="QualitySpeed"
-    top_delta="35" 
+    top_delta="30" 
     width="400">
       Quality &amp; speed:
   </text>
@@ -262,18 +283,6 @@
       function="Pref.RenderOptionUpdate" />
   </check_box>
 
-  <check_box
-    control_name="AutoFPS"
-    height="16"
-    initial_value="true"
-    label="Auto FPS"
-    layout="topleft"
-    left="30"
-    name="AutoFPS"
-    top_delta="30"
-    width="256">
-  </check_box>
-  
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"