DRTVWR-559 Add control for automatic reflection probes to advanced preferences and featuretable. Remove Reflections checkbox. Don't persist reflection probe volume display between sessions. Incidental decruft.

1 files changed, 44 insertions, 18 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 16b965843d..d867123c4b 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -649,26 +649,12 @@
   </combo_box>
 
   <check_box
-    control_name="RenderReflectionsEnabled"
-    height="16"
-    initial_value="true"
-    label="Reflections"
-    layout="topleft"
-    left="420"
-    name="ReflectionsEnabled"
-    top_delta="16"
-    width="240">
-    <check_box.commit_callback
-      function="Pref.RenderOptionUpdate" />
-  </check_box>
-
-  <check_box
     control_name="RenderScreenSpaceReflections"
     height="16"
     initial_value="true"
     label="Screen Space Reflections"
     layout="topleft"
-    left="440"
+    left="420"
     name="ScreenSpaceReflections"
     top_delta="16"
     width="240">
@@ -682,7 +668,7 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    left="440"
+    left="420"
     name="ReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
@@ -694,7 +680,7 @@
    control_name="RenderReflectionProbeDetail"
    height="18"
    layout="topleft"
-   left_delta="110"
+   left_delta="130"
    top_delta="0"
    name="ReflectionDetail"
    width="150">
@@ -712,7 +698,47 @@
       value="2"/>
   </combo_box>
 
-    <slider
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="ReflectionProbeText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    width="128">
+    Reflection Coverage:
+  </text>
+
+  <combo_box
+   control_name="RenderReflectionProbeLevel"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="ReflectionLevel"
+   width="150">
+    <combo_box.item
+      label="None"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Manual only"
+      name="1"
+      value="1"/>
+    <combo_box.item
+      label="Manual + terrain and water"
+      name="2"
+      value="2"/>
+    <combo_box.item
+      label="Full scene"
+      name="3"
+      value="3"/>
+  </combo_box>
+
+  <slider
     control_name="RenderExposure"
     decimal_digits="1"
     follows="left|top"