STORM-2082 Attempt to put advanced settings into separate floater

1 files changed, 862 insertions, 0 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
new file mode 100644
index 0000000000..981a30b436
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,862 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  height="680"
+  layout="topleft"
+  name="prefs_graphics_advanced"
+  help_topic="Preferences_Graphics_Advanced"
+  single_instance="true"
+  save_rect="true"
+  title="ADVANCED GRAPHICS PREFERENCES"
+  width="450">
+
+<!-- This block shows Advanced Settings -->
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset all to recommended settings"
+    layout="topleft"
+    left="10"
+    name="Defaults"
+    top="5"
+    width="250">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="GeneralText"
+    top_delta="35"
+    left="5"
+    width="128">
+     General
+  </text>
+
+  <slider
+    control_name="RenderFarClip"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Draw distance:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="64"
+    max_val="512"
+    name="DrawDistance"
+    top_delta="16"
+    width="330" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    left_delta="330"
+    width="102">
+      m
+  </text> 
+
+  <slider
+    control_name="RenderMaxPartCount"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="256"
+    initial_value="4096"
+    label="Max. particle count:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="8192"
+    name="MaxParticleCount"
+    top_delta="16"
+    width="336" />
+
+  <slider
+    control_name="RenderGlowResolutionPow"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="8"
+    label="Post process quality:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="8"
+    max_val="9"
+    name="RenderPostProcess"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="PostProcessText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="PostProcessText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Avatar
+  </text>
+
+  <slider
+    control_name="MaximumARC"
+    follows="left|top"
+    height="16"
+    initial_value="101"
+    increment="1"
+    label="Maximum ARC:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="101"
+    name="MaximumARC"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="MaximumARCText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    text_readonly_color="LabelDisabledColor"
+    name="MaximumARCText"
+    width="128">
+       0
+  </text>
+
+  <slider
+    control_name="RenderAvatarMaxVisible"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="12"
+    label="Max. # of non-impostors:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="66"
+    name="MaxNumberAvatarDrawn"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="ImpostorsText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    text_readonly_color="LabelDisabledColor"
+    name="ImpostorsText"
+    width="128">
+       0
+  </text>
+
+  <slider
+    control_name="RenderAvatarLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Detail:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="AvatarMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="AvatarMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+     Low
+  </text>
+
+  <slider
+    control_name="RenderAvatarPhysicsLODFactor"
+    follows="left|top"
+    height="16"
+    initial_value="100"
+    increment=".05"
+    label="Physics:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="AvatarPhysicsDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="AvatarPhysicsDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="304"
+    name="AvatarPhysicsDetailText"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ShadersText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Shaders
+  </text>
+
+  <check_box
+    control_name="RenderTransparentWater"
+    height="16"
+    initial_value="true"
+    label="Transparent Water"
+    layout="topleft"
+    left="30"
+    name="TransparentWater"
+    top_delta="16"
+    width="300" />
+
+  <check_box
+    control_name="RenderObjectBump"
+    height="16"
+    initial_value="true"
+    label="Bump mapping and shiny"
+    layout="topleft"
+    left="30"
+    name="BumpShiny"
+    top_delta="16"
+    width="300">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderLocalLights"
+    height="16"
+    initial_value="true"
+    label="Local Lights"
+    layout="topleft"
+    left="30"
+    name="LocalLights"
+    top_delta="16"
+    width="300" />
+
+  <check_box
+    control_name="VertexShaderEnable"
+    height="16"
+    initial_value="true"
+    label="Basic shaders"
+    layout="topleft"
+    left="30"
+    name="BasicShaders"
+    tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
+    top_delta="16"
+    width="300">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <slider
+    control_name="RenderTerrainDetail"
+    follows="left|top"
+    height="16"
+    label="Terrain Detail:"
+    label_width="165"
+    layout="topleft"
+    left="50"
+    show_text="false"
+    initial_value="0"
+    increment="1"
+    min_val="0"
+    max_val="1"
+    name="TerrainDetail"
+    top_delta="16"
+    width="280" >
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TerrainDetail" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="284"
+    name="TerrainDetailText"
+    text_readonly_color="LabelDisabledColor"
+    width="128">
+       Low
+  </text>
+
+  <check_box
+    control_name="RenderAvatarVP"
+    height="16"
+    initial_value="true"
+    label="Avatar Hardware skinning"
+    layout="topleft"
+    left="50"
+    name="AvatarVertexProgram"
+    top_delta="16"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderAvatarCloth"
+    height="16"
+    initial_value="true"
+    label="Avatar cloth"
+    layout="topleft"
+    left="50"
+    name="AvatarCloth"
+    top_delta="16"
+    width="280" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ReflectionsText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    left="50"
+    width="128">
+       Water Reflections:
+  </text>
+  <combo_box
+    control_name="RenderReflectionDetail"
+    height="18"
+    layout="topleft"
+    left_delta="170"
+    top_delta="0"
+    name="Reflections"
+    width="150">
+      <combo_box.item
+        label="Minimal"
+        name="0"
+        value="0"/>
+      <combo_box.item
+        label="Terrain and trees"
+        name="1"
+        value="1"/>
+      <combo_box.item
+        label="All static objects"
+        name="2"
+        value="2"/>
+      <combo_box.item
+        label="All avatars and objects"
+        name="3"
+        value="3"/>
+      <combo_box.item
+        label="Everything"
+        name="4"
+        value="4"/>
+  </combo_box>
+
+  <check_box
+    control_name="WindLightUseAtmosShaders"
+    height="16"
+    initial_value="true"
+    label="Atmospheric shaders"
+    layout="topleft"
+    left="50"
+    name="WindLightUseAtmosShaders"
+    top_delta="16"
+    width="280">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <slider
+    control_name="WLSkyDetail"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="8"
+    initial_value="160"
+    label="Sky:"
+    label_width="145"
+    layout="topleft"
+    left="70"
+    min_val="16"
+    max_val="128"
+    name="SkyMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="260">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="SkyMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_delta="264"
+    name="SkyMeshDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="0"
+    width="128">
+       Low
+  </text>
+
+  <check_box
+    control_name="RenderDeferred"
+    height="16"
+    initial_value="true"
+    label="Advanced Lighting Model"
+    layout="topleft"
+    left="70"
+    name="UseLightShaders"
+    top_delta="16"
+    width="260">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDeferredSSAO"
+    height="16"
+    initial_value="true"
+    label="Ambient Occlusion"
+    layout="topleft"
+    left="90"
+    name="UseSSAO"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <check_box
+    control_name="RenderDepthOfField"
+    height="16"
+    initial_value="true"
+    label="Depth of Field"
+    layout="topleft"
+    left="90"
+    name="UseDoF"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="90"
+    name="RenderShadowDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="16"
+    width="128">
+      Shadows:
+  </text>
+  <combo_box
+   control_name="RenderShadowDetail"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0" 
+   name="ShadowDetail"
+   width="150">
+     <combo_box.item
+       label="None"
+       name="0"
+       value="0"/>
+     <combo_box.item
+       label="Sun/Moon"
+       name="1"
+       value="1"/>
+     <combo_box.item
+       label="Sun/Moon + Projectors"
+       name="2"
+       value="2"/>
+  </combo_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="AvatarText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Mesh
+  </text>
+
+  <slider
+    control_name="RenderTerrainLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Terrain Mesh Detail:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="1"
+    max_val="2"
+    name="TerrainMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TerrainMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="TerrainMeshDetailText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderTreeLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Trees:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="TreeMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="TreeMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="TreeMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderVolumeLODFactor"
+    follows="left|top"
+    height="16"
+    increment="0.125"
+    initial_value="160"
+    label="Objects:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="2"
+    name="ObjectMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+      function="Pref.UpdateSliderText"
+      parameter="ObjectMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ObjectMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <slider
+    control_name="RenderFlexTimeFactor"
+    follows="left|top"
+    height="16"
+    initial_value="160"
+    label="Flexiprims:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="FlexibleMeshDetail"
+    show_text="false"
+    top_delta="16"
+    width="300">
+    <slider.commit_callback
+   function="Pref.UpdateSliderText"
+      parameter="FlexibleMeshDetailText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="FlexibleMeshDetailText"
+    top_delta="0"
+    left_delta="304"
+    width="128">
+       Low
+  </text>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    name="ShadersText"
+    top_delta="20"
+    left="5"
+    width="128">
+     Hardware
+  </text>
+
+  <slider
+    control_name="TextureMemory"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="16"
+    initial_value="32"
+    label="Texture Memory (MB):"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    max_val="4096"
+    name="GraphicsCardTextureMemory"
+    tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."
+    top_delta="16"
+    width="335" />
+
+  <slider
+    control_name="RenderFogRatio"
+    follows="left|top"
+    height="16"
+    initial_value="4"
+    decimal_digits="1"
+    label="Fog Distance Ratio:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="fog"
+    min_val="0.5"
+    max_val="10"
+    increment="0.1"
+    top_delta="16"
+    width="332" />
+
+  <slider
+    control_name="RenderGamma"
+    follows="left|top"
+    height="16"
+    initial_value="1"
+    decimal_digits="2"
+    label="Gamma:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    name="gamma"
+    min_val="0"
+    max_val="2"
+    increment="0.01"
+    top_delta="16"
+    width="332" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="30"
+    name="(brightness, lower is brighter)"
+    top_delta="16"
+    width="230">
+      (0 = default brightness, lower = brighter)
+  </text>
+
+  <check_box
+    control_name="RenderAnisotropic"
+    height="16"
+    label="Anisotropic Filtering (slower when enabled)"
+    layout="topleft"
+    left="30"
+    name="ani"
+    top_delta="16"
+    width="256" />
+
+  <check_box
+    control_name="RenderVBOEnable"
+    height="16"
+    initial_value="true"
+    label="Enable OpenGL Vertex Buffer Objects"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="vbo"
+    tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+    width="315" />
+
+  <check_box
+    control_name="RenderCompressTextures"
+    height="16"
+    initial_value="true"
+    label="Enable Texture Compression (requires restart)"
+    layout="topleft"
+    left="30"
+    top_delta="16"
+    name="texture compression"
+    tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+    width="315" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="20"
+    layout="topleft"
+    left="30"
+    name="antialiasing label"
+    top_delta="20"
+    width="100">
+      Antialiasing:
+  </text>
+  <combo_box
+    control_name="RenderFSAASamples"
+    height="20"
+    initial_value="false"
+    label="Antialiasing"
+    layout="topleft"
+    left_pad="40"
+    name="fsaa"
+    top_delta="0"
+    width="90">
+    <combo_box.item
+      label="Disabled"
+      name="FSAADisabled"
+      value="0" />
+    <combo_box.item
+      label="2x"
+      name="2x"
+      value="2" />
+    <combo_box.item
+     label="4x"
+     name="4x"
+     value="4" />
+    <combo_box.item
+     label="8x"
+     name="8x"
+     value="8" />
+    <combo_box.item
+     label="16x"
+     name="16x"
+     value="16" />
+  </combo_box>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_pad="10"
+    name="antialiasing restart"
+    top_delta="0"
+    width="190">
+     (requires viewer restart)
+  </text>
+<!-- End of Advanced Settings block -->
+
+</floater>