Merge with viewer-2.0.0-3 branch

1 files changed, 158 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
new file mode 100644
index 0000000000..f0e2911fd8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="224"
+ layout="topleft"
+ name="Hardware Settings Floater"
+ title="Hardware Settings"
+ width="500">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="Filtering:"
+     top="30"
+     width="128">
+        Filtering:
+    </text>
+    <check_box
+     control_name="RenderAnisotropic"
+     height="16"
+     label="Anisotropic Filtering (slower when enabled)"
+     layout="topleft"
+     left_pad="10"
+     name="ani"
+     top_delta="0"
+     width="256" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="Antialiasing:"
+     top="49"
+     width="128">
+        Antialiasing:
+    </text>
+    <combo_box
+     control_name="RenderFSAASamples"
+     height="16"
+     initial_value="false"
+     label="Antialiasing"
+     layout="topleft"
+     left_pad="10"
+     name="fsaa"
+     top_delta="0"
+     width="64">
+        <combo_box.item
+         label="Disabled"
+         value="0" />
+        <combo_box.item
+         label="2x"
+         value="2" />
+        <combo_box.item
+         label="4x"
+         value="4" />
+        <combo_box.item
+         label="8x"
+         value="8" />
+        <combo_box.item
+         label="16x"
+         value="16" />
+    </combo_box>
+    <spinner
+     control_name="RenderGamma"
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="1"
+     label="Gamma:"
+     label_width="138"
+     layout="topleft"
+     left="10"
+     max_val="2"
+     name="gamma"
+     top="70"
+     width="202" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left_pad="10"
+     name="(brightness, lower is brighter)"
+     top_delta="2"
+     width="315">
+        (brightness, lower is brighter, 0=use default)
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="12"
+     layout="topleft"
+     left="10"
+     name="Enable VBO:"
+     top="92"
+     width="128">
+        Enable VBO:
+    </text>
+    <check_box
+     control_name="RenderVBOEnable"
+     height="16"
+     initial_value="true"
+     label="Enable OpenGL Vertex Buffer Objects"
+     layout="topleft"
+     left_pad="10"
+     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."
+     top_delta="1"
+     width="315" />
+    <slider
+     control_name="TextureMemory"
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="16"
+     initial_value="32"
+     label="Texture Memory (MB):"
+     label_width="135"
+     layout="topleft"
+     left="10"
+     max_val="4096"
+     name="GrapicsCardTextureMemory"
+     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="114"
+     width="300" />
+    <spinner
+     control_name="RenderFogRatio"
+     decimal_digits="1"
+     follows="left|top"
+     height="16"
+     initial_value="4"
+     label="Fog Distance Ratio:"
+     label_width="138"
+     layout="topleft"
+     left_delta="0"
+     max_val="10"
+     min_val="0.5"
+     name="fog"
+     top_pad="8"
+     width="202" />
+    <button
+     follows="right|bottom"
+     height="20"
+     label="OK"
+     label_selected="OK"
+     layout="topleft"
+     left="-110"
+     name="OK"
+     top="194"
+     width="90" />
+</floater>