Adding lower max texture resolution choices in the preferences

This commit adds 128 and 256 pixels texture resolution limit
in the preferences. This aims to help lower end hardware in texture heavy sims.

3 files changed, 23 insertions, 7 deletions

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 7a25fb03a5..c50cd5083f 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -3001,7 +3001,7 @@ void LLViewerLODTexture::processTextureStats()
         // restrict texture resolution to download based on RenderMaxTextureResolution
         static LLCachedControl<U32> max_texture_resolution(gSavedSettings, "RenderMaxTextureResolution", 2048);
         // sanity clamp debug setting to avoid settings hack shenanigans
-        max_tex_res = (F32)llclamp((S32)max_texture_resolution, 512, MAX_IMAGE_SIZE_DEFAULT);
+        max_tex_res = (F32)llclamp((S32)max_texture_resolution, 128, MAX_IMAGE_SIZE_DEFAULT);
         mMaxVirtualSize = llmin(mMaxVirtualSize, max_tex_res * max_tex_res);
     }
 
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 9644bb9f34..1f59cf0ff3 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
@@ -52,7 +52,7 @@
     left_delta="330"
     width="20">
      m
-  </text> 
+  </text>
   <slider
     control_name="RenderMaxPartCount"
     decimal_digits="0"
@@ -141,6 +141,14 @@
      tool_tip="Maximum resolution for 'level of detail' textures"
      width="90">
         <combo_box.item
+          label="128"
+          name="128"
+          value="128"/>
+        <combo_box.item
+          label="256"
+          name="256"
+          value="256"/>
+        <combo_box.item
           label="512"
           name="512"
           value="512"/>
@@ -626,9 +634,9 @@
       layout="topleft"
       left="385"
       name="vert_border"
-      top="16"      
+      top="16"
       width="0"/>
-  
+
   <text
     type="string"
     length="1"
@@ -732,7 +740,7 @@
         <check_box.commit_callback
           function="Pref.RenderOptionUpdate" />
     </check_box>
-    
+
   <text
     type="string"
     length="1"
@@ -751,7 +759,7 @@
    height="18"
    layout="topleft"
    left_delta="130"
-   top_delta="0" 
+   top_delta="0"
    name="ShadowDetail"
    width="150">
      <combo_box.item
@@ -785,7 +793,7 @@
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
   </check_box>
-  
+
   <text
     type="string"
     length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
index c31706adeb..2fcdf2a546 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics3.xml
@@ -1697,6 +1697,14 @@ left_delta="150"
 top_delta="0"
 width="90">
 <combo_box.item
+label="128x128"
+name="128"
+value="128"/>
+<combo_box.item
+label="256x256"
+name="256"
+value="256"/>
+<combo_box.item
 label="512x512"
 name="512"
 value="512"/>