STORM-2082 Merge Hardware floater into main graphics preferences display

Change notifications so they are emitted only when an error occurs
Put active preset at top of list
Add Maximum ARC slider
Merge two small methods into slider update code

3 files changed, 209 insertions, 20 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1618ea0ec7..340777faf3 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7659,16 +7659,16 @@ Attachment has been saved.
 
   <notification
     icon="notifytip.tga"
-	name="PresetSaved"
+	name="PresetNotSaved"
     type="notifytip">
-Preset [NAME] has been saved.
+Error saving preset [NAME].
   </notification>
 
   <notification
     icon="notifytip.tga"
-	name="PresetDeleted"
+	name="PresetNotDeleted"
     type="notifytip">
-Preset [NAME] has been deleted.
+Error deleting preset [NAME].
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index d0a5075dc8..43b9d6003f 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -320,7 +320,7 @@
         <panel
           border="false"
           follows="top|left"
-          height="600"
+          height="700"
           label="CustomGraphics"
           layout="topleft"
           left="5"
@@ -542,9 +542,42 @@
             min_val="1"
             max_val="65"
             name="MaxNumberAvatarDrawn"
-            top_delta="20"
+            top_delta="16"
             width="325" />
 
+          <slider
+            control_name="MaximumARC"
+            follows="left|top"
+            height="16"
+            initial_value="0"
+            increment=".1"
+            label="Maximum ARC:"
+            label_width="185"
+            layout="topleft"
+            left="30"
+            min_val="0"
+            max_val="13"
+            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"
+            name="MaximumARCText"
+            width="128">
+               Low
+          </text>
+
           <check_box
             control_name="RenderUseImpostors"
             height="16"
@@ -941,6 +974,173 @@
             width="128">
               None
           </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>
         </panel>
       </scroll_container>
     </panel>
@@ -958,18 +1158,6 @@
       <button.commit_callback
         function="Pref.HardwareDefaults" />
     </button>
-    <button
-      follows="right|bottom"
-      height="23"
-      label="Hardware..."
-      label_selected="Hardware"
-      layout="topleft"
-      left_pad="25"
-      name="GraphicsHardwareButton"
-      top="310"
-      width="115">
-      <button.commit_callback
-        function="Pref.HardwareSettings" />
-    </button>
+
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1c655c6559..023c6e5bbb 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4044,5 +4044,6 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
-
+  <string name="Default">Default</string>
+  <string name="Off">Off</string>
   </strings>