diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2e8737f0d7395731ce1beb91be51233be4ab8e88..17b43901a9f8f32fdd54bf1862f39e675ec9e242 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10529,17 +10529,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowAdvancedGraphicsSettings</key>
- <map>
- <key>Comment</key>
- <string>Show advanced graphics settings</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>ShowAllObjectHoverTip</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/skins/default/textures/icons/FastPrefs_Icon.png b/indra/newview/skins/default/textures/icons/FastPrefs_Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..380d3812d8f0ec2e2d259eba4744025daebcde53
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/FastPrefs_Icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f10d966d5dae513442556722ea1a090864d5e2d..2dbf9d1baba562b3305a119e6b29c1425b6fbaa6 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -204,6 +204,8 @@ with the same filename but different name
<texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
+ <texture name="FastPrefs_Icon" file_name="icons/FastPrefs_Icon.png" preload="true" />
+
<texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
<texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
<texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml b/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml
deleted file mode 100644
index 0e0f8f6865c89b6793f5e50b9353fd802faa8629..0000000000000000000000000000000000000000
--- a/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- mouse_opaque="false"
- name="menu_preferences_graphics_gear"
- visible="false">
- <menu_item_call
- label="New preset"
- layout="topleft"
- name="new">
- <on_click
- function="Pref.GraphicPresetNew" />
- </menu_item_call>
- <menu_item_call
- label="Delete preset"
- layout="topleft"
- name="new">
- <on_click
- function="Pref.GraphicPresetDelete" />
- </menu_item_call>
-</toggleable_menu>
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 955c0f1a419fed95afcf4c9b8b05ea918c8ce792..0a7cc995c71bf7a8c0b443c0ac9e88bfd5718e32 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -20,8 +20,8 @@
left="5"
name="label"
top="10"
- width="120">
- Graphic Presets:
+ width="60">
+ Presets:
</text>
<combo_box
allow_text_entry="true"
@@ -32,21 +32,30 @@
name="graphic_preset_combo"
top_delta="0"
width="200"/>
-
- <menu_button
+ <button
follows="top|left"
- height="24"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
+ height="23"
+ label="Save As..."
layout="topleft"
- left_pad="20"
- menu_filename="menu_preferences_graphics_gear.xml"
- name="gear_btn"
+ left_pad="5"
+ name="PrefSaveAsButton"
top_delta="0"
- tool_tip="More options"
- width="24" />
-
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefSaveAs" />
+ </button>
+ <button
+ follows="top|left"
+ height="23"
+ label="Delete"
+ layout="topleft"
+ left_pad="5"
+ name="PrefDeleteButton"
+ top_delta="0"
+ width="115">
+ <button.commit_callback
+ function="Pref.PrefDelete" />
+ </button>
<text
type="string"
length="1"
@@ -161,156 +170,35 @@
top_delta="-2"
width="275">
<slider.commit_callback
- function="Pref.QualityPerformance"/>
- </slider>
+ function="Pref.QualityPerformance"/>
+ </slider>
- <button
- control_name="ShowAdvancedGraphicsSettings"
- enabled_control="ShowAdvancedGraphicsSettings"
- is_toggle="true"
- image_selected="PushButton_Off"
- follows="top|left"
- height="23"
- label="Basic Settings"
- layout="topleft"
- left="10"
- name="Basic"
- top_delta="25"
- width="140" />
- <button
- control_name="ShowAdvancedGraphicsSettings"
- disabled_control="ShowAdvancedGraphicsSettings"
- is_toggle="true"
- image_disabled_selected="PushButton_Disabled"
- follows="top|left"
- height="23"
- label="Advanced Settings"
- layout="topleft"
- left_pad="5"
- name="Advanced"
- top_delta="0"
- width="140" />
<!--End of block that is always displayed -->
-<!-- Basic Settings or Advanced settings will be displayed at any given time, never both at once. -->
-<!-- This block shows Basic Settings -->
- <slider
- control_name="RenderAvatarLODFactor"
- invisibility_control="ShowAdvancedGraphicsSettings"
- follows="left|top"
- height="16"
- increment="0.125"
- initial_value="160"
- label="Avatar detail:"
- label_width="90"
- layout="topleft"
- left="30"
- name="AvatarMeshDetail2"
- show_text="false"
- top_delta="40"
- width="300">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="AvatarMeshDetailText2" />
- </slider>
- <text
- type="string"
- invisibility_control="ShowAdvancedGraphicsSettings"
- length="1"
- follows="left|top"
- height="12"
- layout="topleft"
- name="AvatarMeshDetailText2"
- top_delta="0"
- left_delta="304"
- width="128">
- Low
- </text>
-
- <slider
- control_name="RenderFarClip"
- invisibility_control="ShowAdvancedGraphicsSettings"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="8"
- initial_value="160"
- label="Draw distance:"
- label_width="90"
- layout="topleft"
- left="30"
- min_val="64"
- max_val="512"
- name="DrawDistance"
- top_delta="40"
- width="330" />
- <text
- type="string"
- invisibility_control="ShowAdvancedGraphicsSettings"
- length="1"
+ <tab_container
follows="left|top"
- height="12"
- layout="topleft"
- left_delta="330"
- name="DrawDistanceMeterText2"
- top_delta="0"
- width="128">
- m
- </text>
-
- <check_box
- control_name="RenderDeferred"
- invisibility_control="ShowAdvancedGraphicsSettings"
- height="16"
- initial_value="true"
- label="Advanced Lighting Model"
- layout="topleft"
- left="30"
- name="UseLightShaders2"
- top_delta="40"
- width="256">
- <check_box.commit_callback
- function="Pref.VertexShaderEnable" />
- </check_box>
-<!-- End of Basic Settings block -->
+ height="400"
+ halign="center"
+ left="0"
+ name="PreferencesGraphicsTabs"
+ tab_max_width="300"
+ tab_min_width="40"
+ tab_position="top"
+ tab_height="25"
+ top_delta="25"
+ width="517">
-<!-- This block shows Advanced Settings -->
- <scroll_container
- visibility_control="ShowAdvancedGraphicsSettings"
- follows="top|left"
- height="270"
- label="CustomGraphics"
- layout="topleft"
- left="5"
- name="CustomGraphics Scroll"
- reserve_scroll_corner="true"
- top="106"
- width="500">
+<!-- This block shows Basic Settings -->
<panel
- visibility_control="ShowAdvancedGraphicsSettings"
border="false"
- follows="top|left"
- height="600"
- label="CustomGraphics"
+ follows="all"
+ label="Basic Settings"
layout="topleft"
- left="5"
- name="CustomGraphics Panel"
- top="106"
- width="485">
-
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- name="AvatarText"
- top="10"
- left="5"
- width="128">
- Avatar
- </text>
+ mouse_opaque="false"
+ name="Basic"
+ top="30"
+ width="517">
<slider
control_name="RenderAvatarLODFactor"
@@ -318,240 +206,29 @@
height="16"
increment="0.125"
initial_value="160"
- label="Detail:"
- label_width="185"
+ label="Avatar detail:"
+ label_width="90"
layout="topleft"
left="30"
- name="AvatarMeshDetail"
+ name="AvatarMeshDetail2"
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" />
+ parameter="AvatarMeshDetailText2" />
</slider>
<text
type="string"
length="1"
follows="left|top"
- height="16"
+ height="12"
layout="topleft"
+ name="AvatarMeshDetailText2"
top_delta="0"
left_delta="304"
- name="AvatarPhysicsDetailText"
- width="128">
- Low
- </text>
-
- <slider
- control_name="RenderAvatarMaxVisible"
- decimal_digits="0"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="12"
- label="Max. # of non-impostor avatars:"
- label_width="185"
- layout="topleft"
- left="30"
- min_val="1"
- max_val="65"
- name="MaxNumberAvatarDrawn"
- top_delta="20"
- width="325" />
-
- <check_box
- control_name="RenderUseImpostors"
- height="16"
- initial_value="true"
- label="Avatar impostors"
- layout="topleft"
- left="30"
- name="AvatarImpostors"
- top_delta="20"
- width="300" />
-
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- name="AvatarText"
- top_delta="40"
- 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"
- 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="OtherText"
- top_delta="40"
- left="5"
width="128">
- Other
+ Low
</text>
<slider
@@ -562,159 +239,27 @@
increment="8"
initial_value="160"
label="Draw distance:"
- label_width="185"
+ label_width="90"
layout="topleft"
left="30"
min_val="64"
max_val="512"
name="DrawDistance"
- top_delta="16"
+ top_delta="30"
width="330" />
<text
type="string"
length="1"
follows="left|top"
- height="16"
+ height="12"
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>
-
- <slider
- control_name="RenderTerrainDetail"
- follows="left|top"
- height="16"
- label="Terrain Detail:"
- label_width="185"
- layout="topleft"
- left="30"
- show_text="false"
- initial_value="0"
- increment="1"
- min_val="0"
- max_val="1"
- name="TerrainDetail"
- top_delta="16"
- width="300" >
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="TerrainDetailText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
+ name="DrawDistanceMeterText2"
top_delta="0"
- left_delta="304"
- name="TerrainDetailText"
- width="128">
- Low
- </text>
-
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- name="ShadersText"
- top_delta="40"
- left="5"
width="128">
- Shaders
+ m
</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"
@@ -724,234 +269,716 @@
left="30"
name="BasicShaders"
tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
- top_delta="16"
+ top_delta="30"
width="300">
<check_box.commit_callback
function="Pref.VertexShaderEnable" />
</check_box>
- <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" />
-
- <slider
- control_name="RenderReflectionDetail"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="2"
- label="Water Reflections:"
- label_width="165"
- layout="topleft"
- left="50"
- min_val="0"
- max_val="4"
- name="Reflections"
- show_text="false"
- top_delta="16"
- width="280">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="ReflectionsText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- name="ReflectionsText"
- top_delta="0"
- left_delta="284"
- width="128">
- Minimal
- </text>
-
- <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"
- enabled_control="WindLightUseAtmosShaders"
- 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
- enabled_control="WindLightUseAtmosShaders"
- type="string"
- length="1"
- follows="left|top"
- height="16"
- layout="topleft"
- left_delta="264"
- name="SkyMeshDetailText"
- 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">
+ left="50"
+ name="UseLightShaders2"
+ top_delta="20"
+ width="256">
<check_box.commit_callback
function="Pref.VertexShaderEnable" />
</check_box>
+ </panel>
+<!-- End of Basic Settings block -->
- <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>
+<!-- This block shows Advanced Settings -->
+ <panel
+ border="false"
+ follows="all"
+ label="Advanced Settings"
+ layout="topleft"
+ mouse_opaque="false"
+ name="Advanced"
+ top_delta="20"
+ width="517">
- <slider
- control_name="RenderShadowDetail"
- follows="left|top"
- height="16"
- increment="1"
- initial_value="2"
- label="Shadows:"
- label_width="145"
- layout="topleft"
- left="70"
- min_val="0"
- max_val="2"
- name="RenderShadowDetail"
- show_text="false"
- top_delta="16"
- width="260">
- <slider.commit_callback
- function="Pref.UpdateSliderText"
- parameter="RenderShadowDetailText" />
- </slider>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="16"
+ <scroll_container
+ follows="top|left"
+ height="270"
+ label="CustomGraphics"
layout="topleft"
- left_delta="264"
- name="RenderShadowDetailText"
- top_delta="0"
- width="128">
- None
- </text>
+ left="5"
+ name="CustomGraphics Scroll"
+ reserve_scroll_corner="true"
+ top_delta="20"
+ width="500">
+
+ <panel
+ border="false"
+ follows="top|left"
+ height="600"
+ label="CustomGraphics"
+ layout="topleft"
+ left="5"
+ name="CustomGraphics Panel"
+ top="106"
+ width="485">
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="OtherText"
+ top="10"
+ left="5"
+ width="128">
+ Other
+ </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>
+
+ <slider
+ control_name="RenderTerrainDetail"
+ follows="left|top"
+ height="16"
+ label="Terrain Detail:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ show_text="false"
+ initial_value="0"
+ increment="1"
+ min_val="0"
+ max_val="1"
+ name="TerrainDetail"
+ top_delta="16"
+ width="300" >
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="TerrainDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ top_delta="0"
+ left_delta="304"
+ name="TerrainDetailText"
+ 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="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>
+
+ <slider
+ control_name="RenderAvatarMaxVisible"
+ decimal_digits="0"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="12"
+ label="Max. # of non-impostor avatars:"
+ label_width="185"
+ layout="topleft"
+ left="30"
+ min_val="1"
+ max_val="65"
+ name="MaxNumberAvatarDrawn"
+ top_delta="20"
+ width="325" />
+
+ <check_box
+ control_name="RenderUseImpostors"
+ height="16"
+ initial_value="true"
+ label="Avatar impostors"
+ layout="topleft"
+ left="30"
+ name="AvatarImpostors"
+ top_delta="20"
+ width="300" />
+
+ <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"
+ 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">
+ 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>
+
+ <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" />
+
+ <slider
+ control_name="RenderReflectionDetail"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="2"
+ label="Water Reflections:"
+ label_width="165"
+ layout="topleft"
+ left="50"
+ min_val="0"
+ max_val="4"
+ name="Reflections"
+ show_text="false"
+ top_delta="16"
+ width="280">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="ReflectionsText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="ReflectionsText"
+ top_delta="0"
+ left_delta="284"
+ width="128">
+ Minimal
+ </text>
+
+ <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"
+ enabled_control="WindLightUseAtmosShaders"
+ 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
+ enabled_control="WindLightUseAtmosShaders"
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left_delta="264"
+ name="SkyMeshDetailText"
+ 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>
+
+ <slider
+ control_name="RenderShadowDetail"
+ follows="left|top"
+ height="16"
+ increment="1"
+ initial_value="2"
+ label="Shadows:"
+ label_width="145"
+ layout="topleft"
+ left="70"
+ min_val="0"
+ max_val="2"
+ name="RenderShadowDetail"
+ show_text="false"
+ top_delta="16"
+ width="260">
+ <slider.commit_callback
+ function="Pref.UpdateSliderText"
+ parameter="RenderShadowDetailText" />
+ </slider>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left_delta="264"
+ name="RenderShadowDetailText"
+ top_delta="0"
+ width="128">
+ None
+ </text>
+ </panel>
+ </scroll_container>
</panel>
- </scroll_container>
<!-- End of Advanced Settings block -->
- <button
- follows="left|bottom"
- height="23"
- label="Apply"
- label_selected="Apply"
- layout="topleft"
- left="10"
- name="Apply"
- top="390"
- width="115">
- <button.commit_callback
- function="Pref.Apply" />
- </button>
- <button
- follows="left|bottom"
- height="23"
- label="Reset"
- layout="topleft"
- left_pad="5"
- name="Defaults"
- top="390"
- width="115">
- <button.commit_callback
- function="Pref.HardwareDefaults" />
- </button>
- <button
- follows="right|bottom"
- height="23"
- label="Hardware"
- label_selected="Hardware"
- layout="topleft"
- left_pad="150"
- name="GraphicsHardwareButton"
- top="390"
- width="115">
- <button.commit_callback
- function="Pref.HardwareSettings" />
- </button>
+ <button
+ follows="left|bottom"
+ height="23"
+ label="Apply"
+ label_selected="Apply"
+ layout="topleft"
+ left="10"
+ name="Apply"
+ top="310"
+ width="115">
+ <button.commit_callback
+ function="Pref.Apply" />
+ </button>
+ <button
+ follows="left|bottom"
+ height="23"
+ label="Reset"
+ layout="topleft"
+ left_pad="5"
+ name="Defaults"
+ top="310"
+ width="115">
+ <button.commit_callback
+ function="Pref.HardwareDefaults" />
+ </button>
+ <button
+ follows="right|bottom"
+ height="23"
+ label="Hardware..."
+ label_selected="Hardware"
+ layout="topleft"
+ left_pad="150"
+ 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/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 064ece6e4be5e9ae81c79a67d39d72498dbb1c35..a1f7503269a92afdee0d9c6229a89f8042802f5e 100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -35,7 +35,7 @@
</panel.string>
<panel
height="18"
- left="-395"
+ left="-416"
width="185"
top="1"
follows="right|top"
@@ -105,6 +105,15 @@
width="145">
24:00 AM PST
</text>
+ <button
+ follows="right|top"
+ height="16"
+ image_unselected="FastPrefs_Icon"
+ image_selected="FastPrefs_Icon"
+ left_pad="5"
+ top="2"
+ name="fastprefs_btn"
+ width="18" />
<button
follows="right|top"
height="16"