2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 657119ae53..292eef64b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16742,14 +16742,14 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <integer>25</integer>
+    <integer>30</integer>
   </map>
   <key>AutoTuneFPS</key>
   <map>
     <key>Comment</key>
     <string>Allow the viewer to adjust your settings to achieve target FPS</string>
     <key>Persist</key>
-    <integer>0</integer>
+    <integer>1</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e66fefdd1a..87fba5ec1b 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2254,6 +2254,10 @@ bool idle_startup()
 
 	if (STATE_CLEANUP == LLStartUp::getStartupState())
 	{
+        if (gAgent.isFirstLogin())
+        {
+            gSavedSettings.setBOOL("AutoTuneFPS", TRUE);
+        }
         set_startup_status(1.0, "", "");
 		display_startup();