Merge pull request #5829 from secondlife/geenz/texture-quality

Texture streaming rework

1 files changed, 18 insertions, 14 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 99dca7b395..3043b17589 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
@@ -127,31 +127,35 @@
       top_delta="16"
       left="30"
       width="160"
-      name="MaxTextureResolutionLabel"
+      name="TextureQualityLabel"
       text_readonly_color="LabelDisabledColor">
-        Maximum LOD resolution:
+        Texture quality:
     </text>
     <combo_box
-     control_name="RenderMaxTextureResolution"
+     control_name="RenderTextureQuality"
      height="19"
      layout="topleft"
      left_pad="10"
      top_delta="0"
-     name="MaxTextureResolution"
-     tool_tip="Maximum resolution for 'level of detail' textures"
+     name="TextureQuality"
+     tool_tip="Controls maximum texture resolution and how aggressively textures stream by channel. Higher quality keeps more detail in memory."
      width="90">
         <combo_box.item
-          label="512"
-          name="512"
-          value="512"/>
+          label="Low"
+          name="Low"
+          value="0"/>
+        <combo_box.item
+          label="Medium"
+          name="Medium"
+          value="1"/>
         <combo_box.item
-          label="1024"
-          name="1024"
-          value="1024"/>
+          label="High"
+          name="High"
+          value="2"/>
         <combo_box.item
-          label="2048"
-          name="2048"
-          value="2048"/>
+          label="Ultra"
+          name="Ultra"
+          value="3"/>
     </combo_box>
 
   <check_box