diff --git a/indra/newview/app_settings/settings_firestorm.xml b/indra/newview/app_settings/settings_firestorm.xml
index 61d0229fee9..26ac17f8968 100644
--- a/indra/newview/app_settings/settings_firestorm.xml
+++ b/indra/newview/app_settings/settings_firestorm.xml
@@ -230,6 +230,42 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  
+  <key>AutoTuneRenderFarClipMin</key>
+  <map>
+    <key>Comment</key>
+    <string>The lowest draw distance that auto tune is allowed to use</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>32.0</real>
+  </map>
+  
+  <key>AutoTuneRenderFarClipTarget</key>
+  <map>
+    <key>Comment</key>
+    <string>The draw distance that auto tune will try to achieve</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>256.0</real>
+  </map>
+  
+  <key>AutoTuneImpostorFarAwayDistance</key>
+  <map>
+    <key>Comment</key>
+    <string>Avatars beyond this range will automatically be optimized</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>64.0</real>
+  </map>
 
   <key>FSChatWindow</key>
   <map>
diff --git a/indra/newview/fsfloaterperformance.cpp b/indra/newview/fsfloaterperformance.cpp
index 81279fc4693..98f0b99caf7 100644
--- a/indra/newview/fsfloaterperformance.cpp
+++ b/indra/newview/fsfloaterperformance.cpp
@@ -162,8 +162,11 @@ bool FSFloaterPerformance::postBuild()
     mNearbyPanel->getChild<LLSliderCtrl>("RenderAvatarMaxART")->setCommitCallback(boost::bind(&FSFloaterPerformance::updateMaxRenderTime, this));
 
     LLAvatarComplexityControls::setIndirectMaxArc();
+
+    // This seems counter intuitive, since what if a user wants to set this lower or higher than their currently set view distance,
+    // and also have it persist upon viewer startup? Commenting this out for now, so if it is desired it can be easily brought back.
     // store the current setting as the users desired reflection detail and DD
-    if(!LLPerfStats::tunables.userAutoTuneEnabled)
+    /*if(!LLPerfStats::tunables.userAutoTuneEnabled)
     {
         if (gSavedDrawDistance)
         {
@@ -173,7 +176,7 @@ bool FSFloaterPerformance::postBuild()
         {
             gSavedSettings.setF32("AutoTuneRenderFarClipTarget", LLPipeline::RenderFarClip);
         }
-    }
+    }*/
 
     return true;
 }
diff --git a/indra/newview/skins/default/xui/en/floater_fs_performance.xml b/indra/newview/skins/default/xui/en/floater_fs_performance.xml
index 8455163c04d..1d89a93dbf5 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_performance.xml
@@ -297,6 +297,10 @@
             label="Avatars and Scene"
             name="av_and_scene"
             value="1" />
+        <combo_box.item
+            label="Scene Only"
+            name="scene_only"
+            value="2" />
       </combo_box>
       <button
           height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_performance_autotune.xml b/indra/newview/skins/default/xui/en/panel_fs_performance_autotune.xml
index 1e7a9be84c0..0558f18b3ed 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_performance_autotune.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_performance_autotune.xml
@@ -154,7 +154,7 @@ follows="top|left"
 name="pref_dd_autotune"
 left_pad="20"
 min_val="32"
-max_val="256"
+max_val="1024"
 width="140">
 </spinner>
 <text