From b92dd27878c73d23dec9859b317babfde749b33b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 23 Nov 2014 12:11:51 -0500
Subject: STORM-2082 Allow saving and loading of graphic settings

---
 indra/newview/app_settings/settings.xml            |    4 +-
 indra/newview/llfloaterpreference.cpp              |   43 +-
 indra/newview/llfloaterpreference.h                |    2 +
 .../skins/default/xui/en/floater_preferences.xml   |   10 +-
 .../xui/en/menu_preferences_graphics_gear.xml      |   21 +
 .../default/xui/en/panel_preferences_graphics1.xml | 1764 ++++++++++----------
 6 files changed, 968 insertions(+), 876 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f2fb9e854f..2e8737f0d7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9737,13 +9737,13 @@
     <key>RenderTerrainDetail</key>
     <map>
       <key>Comment</key>
-      <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string>
+      <string>Detail applied to terrain texturing (0 = none, 1 = full)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>2</integer>
+      <integer>1</integer>
     </map>
     <key>RenderTerrainLODFactor</key>
     <map>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d3773767d0..3b64ffcf4c 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1099,8 +1099,7 @@ void LLFloaterPreference::buildPopupLists()
 
 void LLFloaterPreference::refreshEnabledState()
 {	
-	LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
-	LLRadioGroup* radio_reflection_detail = getChild<LLRadioGroup>("ReflectionDetailRadio");
+	LLUICtrl* ctrl_reflections = getChild<LLUICtrl>("Reflections");
 	
 	// Reflections
 	BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable") 
@@ -1113,8 +1112,6 @@ void LLFloaterPreference::refreshEnabledState()
 	bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
 	bumpshiny_ctrl->setEnabled(bumpshiny ? TRUE : FALSE);
 	
-	radio_reflection_detail->setEnabled(reflections);
-	
 	// Avatar Mode
 	// Enable Avatar Shaders
 	LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
@@ -1143,20 +1140,19 @@ void LLFloaterPreference::refreshEnabledState()
 	// Vertex Shaders
 	// Global Shader Enable
 	LLCheckBoxCtrl* ctrl_shader_enable   = getChild<LLCheckBoxCtrl>("BasicShaders");
-	// radio set for terrain detail mode
-	LLRadioGroup*   mRadioTerrainDetail = getChild<LLRadioGroup>("TerrainDetailRadio");   // can be linked with control var
+	LLSliderCtrl*   terrain_detail = getChild<LLSliderCtrl>("TerrainDetail");   // can be linked with control var
 	
 	ctrl_shader_enable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
 	
 	BOOL shaders = ctrl_shader_enable->get();
 	if (shaders)
 	{
-		mRadioTerrainDetail->setValue(1);
-		mRadioTerrainDetail->setEnabled(FALSE);
+		terrain_detail->setValue(1);
+		terrain_detail->setEnabled(FALSE);
 	}
 	else
 	{
-		mRadioTerrainDetail->setEnabled(TRUE);		
+		terrain_detail->setEnabled(TRUE);		
 	}
 	
 	// WindLight
@@ -1209,7 +1205,7 @@ void LLFloaterPreference::refreshEnabledState()
 
 void LLFloaterPreference::disableUnavailableSettings()
 {	
-	LLComboBox* ctrl_reflections   = getChild<LLComboBox>("Reflections");
+	LLUICtrl* ctrl_reflections   = getChild<LLUICtrl>("Reflections");
 	LLCheckBoxCtrl* ctrl_avatar_vp     = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
 	LLCheckBoxCtrl* ctrl_avatar_cloth  = getChild<LLCheckBoxCtrl>("AvatarCloth");
 	LLCheckBoxCtrl* ctrl_shader_enable = getChild<LLCheckBoxCtrl>("BasicShaders");
@@ -1360,6 +1356,8 @@ void LLFloaterPreference::refresh()
 {
 	LLPanel::refresh();
 
+	refreshEnabledState();
+
 	// sliders and their text boxes
 	//	mPostProcess = gSavedSettings.getS32("RenderGlowResolutionPow");
 	// slider text boxes
@@ -1372,8 +1370,9 @@ void LLFloaterPreference::refresh()
 	updateSliderText(getChild<LLSliderCtrl>("TerrainMeshDetail",	true), getChild<LLTextBox>("TerrainMeshDetailText",		true));
 	updateSliderText(getChild<LLSliderCtrl>("RenderPostProcess",	true), getChild<LLTextBox>("PostProcessText",			true));
 	updateSliderText(getChild<LLSliderCtrl>("SkyMeshDetail",		true), getChild<LLTextBox>("SkyMeshDetailText",			true));
-	
-	refreshEnabledState();
+	updateSliderText(getChild<LLSliderCtrl>("TerrainDetail",		true), getChild<LLTextBox>("TerrainDetailText",			true));	
+	updateReflectionsText(getChild<LLSliderCtrl>("Reflections",		true), getChild<LLTextBox>("ReflectionsText",			true));	
+	updateRenderShadowDetailText(getChild<LLSliderCtrl>("RenderShadowDetail",		true), getChild<LLTextBox>("RenderShadowDetailText",			true));	
 }
 
 void LLFloaterPreference::onCommitWindowedMode()
@@ -1625,6 +1624,23 @@ void LLFloaterPreference::refreshUI()
 	refresh();
 }
 
+void LLFloaterPreference::updateReflectionsText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+{
+	if (text_box == NULL || ctrl== NULL)
+		return;
+	
+	U32 value = (U32)ctrl->getValue().asInteger();
+	text_box->setText(getString("Reflections" + llformat("%d", value)));
+}
+void LLFloaterPreference::updateRenderShadowDetailText(LLSliderCtrl* ctrl, LLTextBox* text_box)
+{
+	if (text_box == NULL || ctrl== NULL)
+		return;
+	
+	U32 value = (U32)ctrl->getValue().asInteger();
+	text_box->setText(getString("RenderShadowDetail" + llformat("%d", value)));
+}
+
 void LLFloaterPreference::updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box)
 {
 	if (text_box == NULL || ctrl== NULL)
@@ -2093,6 +2109,9 @@ static LLPanelInjector<LLPanelPreferencePrivacy> t_pref_privacy("panel_preferenc
 
 BOOL LLPanelPreferenceGraphics::postBuild()
 {
+	LLComboBox* graphic_preset = getChild<LLComboBox>("graphic_preset_combo");
+	graphic_preset->setLabel(getString("graphic_preset_combo_label"));
+
 	return LLPanelPreference::postBuild();
 }
 void LLPanelPreferenceGraphics::draw()
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 7bf6ae7d79..3ac5b2ad81 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -157,6 +157,8 @@ public:
 	void onChangeQuality(const LLSD& data);
 	
 	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateReflectionsText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateRenderShadowDetailText(LLSliderCtrl* ctrl, LLTextBox* text_box);
 	void refreshUI();
 
 	void onCommitParcelMediaAutoPlayEnable();
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index bd6faf4ed8..edc205927c 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,7 +11,15 @@
  single_instance="true"
  title="PREFERENCES"
  width="658">
-    <button
+   <string name="Reflections0">Minimal</string>
+   <string name="Reflections1">Terrain and trees</string>
+   <string name="Reflections2">All static objects</string>
+   <string name="Reflections3">All avatars and objects</string>
+   <string name="Reflections4">Everything</string>
+   <string name="RenderShadowDetail0">None</string>
+   <string name="RenderShadowDetail1">Sun/Moon</string>
+   <string name="RenderShadowDetail2">Sun/Moon + Projectors</string>
+   <button
      follows="right|bottom"
      height="23"
      label="OK"
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
new file mode 100644
index 0000000000..0e0f8f6865
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_preferences_graphics_gear.xml
@@ -0,0 +1,21 @@
+<?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 6c485c0595..72976deaed 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -9,905 +9,947 @@
  name="Display panel"
  top="1"
  width="517">
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="30"
-     name="QualitySpeed"
-     top="10" 
-     width="400">
-        Quality and speed:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="right"
-     height="12"
-     layout="topleft"
-     left="35"
-     name="FasterText"
-     top_pad="4"
-     width="80">
-        Faster
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left_delta="360"
-     name="BetterText"
-     top_delta="0"
-     width="100">
-        Better
-    </text>
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left="128"
-     name="LowGraphicsDivet"
-     top_delta="-2"
-     width="2" />
+   <string name="graphic_preset_combo_label">-Select a preset-</string>
+
+<!-- This block is always displayed -->
+  <text
+    follows="top|left|right"
+    font="SansSerif"
+    height="16"
+    layout="topleft"
+    left="5"
+    name="label"
+    top="10"
+    width="120">
+      Graphic Presets:
+  </text>
+  <combo_box
+   	allow_text_entry="true"
+   	follows="top|left"
+   	layout="topleft"
+   	left_pad="0"
+   	max_chars="100"
+   	name="graphic_preset_combo"
+   	top_delta="0"
+   	width="200"/>
+
+  <menu_button
+    follows="top|left"
+    height="24"
+    image_disabled="OptionsMenu_Disabled"
+    image_selected="OptionsMenu_Press"
+    image_unselected="OptionsMenu_Off"
+    layout="topleft"
+    left_pad="20"
+    menu_filename="menu_preferences_graphics_gear.xml"
+    name="gear_btn"
+    top_delta="0"
+    tool_tip="More options"
+    width="24" />
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left="30"
+    name="QualitySpeed"
+    top_delta="30" 
+    width="400">
+      Quality and speed:
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    halign="right"
+    height="12"
+    layout="topleft"
+    left="35"
+    name="FasterText"
+    top_pad="4"
+    width="80">
+      Faster
+  </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="360"
+    name="BetterText"
+    top_delta="0"
+    width="100">
+      Better
+  </text>
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left="128"
+    name="LowGraphicsDivet"
+    top_delta="-2"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="LowMidGraphicsDivet"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="LowMidGraphicsDivet"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="MidGraphicsDivet"
-     top_delta="0"
-     width="2" />
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="MidGraphicsDivet"
+    top_delta="0"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="MidHighGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="HighGraphicsDivet"
-     top_delta="0"
-     width="2" />
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="MidHighGraphicsDivet"
+    top_delta="0"
+    width="2" />
   <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="HighUltraGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <icon
-     color="DkGray"
-     height="14"
-     image_name="Rounded_Square"
-     layout="topleft"
-     left_pad="41"
-     name="UltraGraphicsDivet"
-     top_delta="0"
-     width="2" />
-    <slider
-     control_name="RenderQualityPerformance"
-     decimal_digits="0"
-     follows="left|top"
-     height="16"
-     increment="1"
-     initial_value="0"
-     layout="topleft"
-     left="120"
-     max_val="6"
-     name="QualityPerformanceSelection"
-     show_text="false"
-     top_delta="-2"
-     width="275">
-	 <slider.commit_callback
-			function="Pref.QualityPerformance"/>
-	</slider>		
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left="88"
-     name="ShadersPrefText"
-     top_delta="20"
-     width="80">
-        Low
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="87"
-     name="ShadersPrefText2"
-     top_delta="0"
-     width="80">
-        Mid
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="87"
-     name="ShadersPrefText3"
-     top_delta="0"
-     width="80">
-        High
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     halign="center"
-     height="12"
-     layout="topleft"
-     left_delta="85"
-     name="ShadersPrefText4"
-     top_delta="0"
-     width="80">
-        Ultra
-    </text>
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="HighGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="HighUltraGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <icon
+    color="DkGray"
+    height="14"
+    image_name="Rounded_Square"
+    layout="topleft"
+    left_pad="41"
+    name="UltraGraphicsDivet"
+    top_delta="0"
+    width="2" />
+  <slider
+    control_name="RenderQualityPerformance"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="0"
+    layout="topleft"
+    left="120"
+    max_val="6"
+    name="QualityPerformanceSelection"
+    show_text="false"
+    top_delta="-2"
+    width="275">
+    <slider.commit_callback
+	  function="Pref.QualityPerformance"/>
+	</slider>
+
+  <button
+    control_name="ShowAdvancedGraphicsSettings"
+    enabled_control="ShowAdvancedGraphicsSettings"
+    is_toggle="true"
+    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"
+    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"
-   invisiblity_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="72"
-   width="300">
+    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" />
+      function="Pref.UpdateSliderText"
+      parameter="AvatarMeshDetailText2" />
   </slider>
   <text
-   type="string"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   length="1"
-   follows="left|top"
-   height="12"
-   layout="topleft"
-   name="AvatarMeshDetailText2"
-   top_delta="0"
-   left_delta="304"
-   width="128">
-    Low
+    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"
-   invisiblity_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"
-   max_val="512"
-   min_val="64"
-   name="DrawDistance"
-   top="110"
-   width="330" />
+    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"
-   invisiblity_control="ShowAdvancedGraphicsSettings"
-   length="1"
-   follows="left|top"
-   height="12"
-   layout="topleft"
-   left_delta="330"
-   name="DrawDistanceMeterText2"
-   top_delta="0"
-   width="128">
-    m
+    type="string"
+    invisibility_control="ShowAdvancedGraphicsSettings"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="330"
+    name="DrawDistanceMeterText2"
+    top_delta="0"
+    width="128">
+     m
   </text>
+
   <check_box
-		 control_name="RenderDeferred"
-     invisiblity_control="ShowAdvancedGraphicsSettings"
-		 height="16"
-		 initial_value="true"
-		 label="Advanced Lighting Model"
-		 layout="topleft"
-		 left="30"
-		 name="UseLightShaders2"
-		 top="148"
-		 width="256">
+    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 -->
+
+<!-- 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">
+
     <panel
-	   visiblity_control="ShowAdvancedGraphicsSettings"
-     border="false"
-	   follows="top|left"
-     height="300"
-     label="CustomGraphics"
-     layout="topleft"
-     left="5"
-     name="CustomGraphics Panel"
-     top="76"
-     width="485">
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="5"
-		 name="ShadersText"
-		 top="3"
-		 width="128">
-			Shaders:
-		</text>
-		<check_box
-		 control_name="RenderTransparentWater"
-		 height="16"
-		 initial_value="true"
-		 label="Transparent Water"
-		 layout="topleft"
-		 left_delta="0"
-		 name="TransparentWater"
-		 top_pad="7"
-		 width="256" />
+      visibility_control="ShowAdvancedGraphicsSettings"
+      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="AvatarText"
+        top="10"
+        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="RenderObjectBump"
-       height="16"
-       initial_value="true"
-       label="Bump mapping and shiny"
-       layout="topleft"
-       left_delta="0"
-       name="BumpShiny"
-       top_pad="1"
-      width="256">
+        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
+      </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="ShadersText"
+        top_delta="40"
+        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" />
+          function="Pref.VertexShaderEnable" />
       </check_box>
-    <check_box
-		 control_name="RenderLocalLights"
-		 height="16"
-		 initial_value="true"
-		 label="Local Lights"
-		 layout="topleft"
-		 left_delta="0"
-		 name="LocalLights"
-		 top_pad="1"
-		 width="256" />
-		  <check_box
-		 control_name="VertexShaderEnable"
-		 height="16"
-		 initial_value="true"
-		 label="Basic shaders"
-		 layout="topleft"
-		 left_delta="0"
-		 name="BasicShaders"
-		 tool_tip="Disabling this option may prevent some graphics card drivers from crashing"
-		 top_pad="1"
-		 width="315">
-			<check_box.commit_callback
-		     function="Pref.VertexShaderEnable" />
-		</check_box>
-		<check_box
-		 control_name="WindLightUseAtmosShaders"
-		 height="16"
-		 initial_value="true"
-		 label="Atmospheric shaders"
-		 layout="topleft"
-		 left_delta="0"
-		 name="WindLightUseAtmosShaders"
-		 top_pad="1"
-		 width="256">
-			<check_box.commit_callback
-			 function="Pref.VertexShaderEnable" />
-		</check_box>
-    	<check_box
-		 control_name="RenderDeferred"
-		 height="16"
-		 initial_value="true"
-		 label="Advanced Lighting Model"
-		 layout="topleft"
-		 left_delta="0"
-		 name="UseLightShaders"
-		 top_pad="1"
-		 width="256">
-         	<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_delta="0"
-		 name="UseSSAO"
-		 top_pad="1"
-		 width="256">
-         	<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_delta="0"
-		 name="UseDoF"
-		 top_pad="1"
-		 width="256">
+        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" />
+          function="Pref.VertexShaderEnable" />
       </check_box>
 
-        <text
-         type="string"
-         length="1"
-         top_pad="8"
-         follows="top|left"
-         height="23"
-         width="110"
-         word_wrap="true"
-         layout="topleft"
-         left="10"
-         name="shadows_label">
-         	Shadows:
-        </text>
-        <combo_box
-         control_name="RenderShadowDetail"
-         height="23"
-         layout="topleft"
-         left="10"
-         top_pad="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"
-         top_pad="8"
-         follows="top|left"
-         height="12"
-         width="110"
-         word_wrap="true"
-         layout="topleft"
-         left="05"
-         name="reflection_label">
-            Water Reflections:
-        </text>
-        <combo_box
-         control_name="RenderReflectionDetail"
-         height="18"
-         layout="topleft"
-         left_delta="10"
-         top_pad ="3"
-         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>
-    
-        <slider
-        control_name="RenderAvatarPhysicsLODFactor"
+      <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"
-        initial_value="100"
-	increment=".05"
-        label="  Avatar Physics:"
-        label_width="85"
+        increment="1"
+        initial_value="2"
+        label="Water Reflections:"
+        label_width="165"
         layout="topleft"
-        left_delta="-16"
-        name="AvatarPhysicsDetail"
+        left="50"
+        min_val="0"
+        max_val="4"
+        name="Reflections"
         show_text="false"
-        top_pad="12"
-        width="160">
-           <slider.commit_callback
-            function="Pref.UpdateSliderText"
-            parameter="AvatarPhysicsDetailText" />
-        </slider>
-        <text
+        top_delta="16"
+        width="280">
+        <slider.commit_callback
+          function="Pref.UpdateSliderText"
+          parameter="ReflectionsText" />
+      </slider>
+      <text
         type="string"
         length="1"
         follows="left|top"
-        height="12"
+        height="16"
         layout="topleft"
-        left_delta="165"
-        name="AvatarPhysicsDetailText"
-        top_pad="-16"
+        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>
-
-		<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="200"
-		 max_val="512"
-		 min_val="64"
-		 name="DrawDistance"
-		 top="3"
-		 width="296" />
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="291"
-		 name="DrawDistanceMeterText2"
-		 top_delta="0"
-		 width="128">
-			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="200"
-		 max_val="8192"
-		 name="MaxParticleCount"
-		 top_pad="7"
-		 width="303" />
-        <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_delta="0"
-         max_val="65"
-         min_val="1"
-         name="MaxNumberAvatarDrawn"
-         top_pad="4"
-         width="290" />
-		<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="200"
-		 max_val="9"
-		 min_val="8"
-		 name="RenderPostProcess"
-		 show_text="false"
-		 top_pad="4"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="PostProcessText" />
-		</slider>
-		<text
-		 type="string"
-		 length="1"
-		 follows="left|top"
-		 height="12"
-		 layout="topleft"
-		 left_delta="0"
-		 name="MeshDetailText"
-		 top_pad="5"
-		 width="128">
-			Mesh detail:
-		</text>
-		<slider
-		 control_name="RenderVolumeLODFactor"
-		 follows="left|top"
-		 height="16"
-		 increment="0.125"
-		 initial_value="160"
-		 label="  Objects:"
-		 label_width="185"
-		 layout="topleft"
-		 left_delta="0"
-		 max_val="2"
-		 name="ObjectMeshDetail"
-		 show_text="false"
-		 top_pad="6"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="ObjectMeshDetailText" />
-		</slider>
-		<slider
-		 control_name="RenderFlexTimeFactor"
-		 follows="left|top"
-		 height="16"
-		 initial_value="160"
-		 label="  Flexiprims:"
-		 label_width="185"
-		 layout="topleft"
-		 left_delta="0"
-		 name="FlexibleMeshDetail"
-		 show_text="false"
-		 top_pad="4"
-		 width="264">
-			<slider.commit_callback
-			 function="Pref.UpdateSliderText"
-			 parameter="FlexibleMeshDetailText" />
-		</slider>
-        <slider
-         control_name="RenderTreeLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Trees:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         name="TreeMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="TreeMeshDetailText" />
-            </slider>
-        <slider
-         control_name="RenderAvatarLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Avatars:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         name="AvatarMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="AvatarMeshDetailText" />
-        </slider>
-        <slider
-         control_name="RenderTerrainLODFactor"
-         follows="left|top"
-         height="16"
-         increment="0.125"
-         initial_value="160"
-         label="  Terrain:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         max_val="2"
-         min_val="1"
-         name="TerrainMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="TerrainMeshDetailText" />
-        </slider>
-        <slider
-         control_name="WLSkyDetail"
-		 enabled_control="WindLightUseAtmosShaders"
-         decimal_digits="0"
-         follows="left|top"
-         height="16"
-         increment="8"
-         initial_value="160"
-         label="  Sky:"
-         label_width="185"
-         layout="topleft"
-         left_delta="0"
-         max_val="128"
-         min_val="16"
-         name="SkyMeshDetail"
-         show_text="false"
-         top_pad="4"
-         width="264">
-            <slider.commit_callback
-             function="Pref.UpdateSliderText"
-             parameter="SkyMeshDetailText" />
-        </slider>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left="469"
-         name="PostProcessText"
-         top="60"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="ObjectMeshDetailText"
-         top_pad="26"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="FlexibleMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="TreeMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="AvatarMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="TerrainMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-        <text
-		 enabled_control="WindLightUseAtmosShaders"
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="0"
-         name="SkyMeshDetailText"
-         top_pad="8"
-         width="128">
-            Low
-        </text>
-
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="12"
-         layout="topleft"
-         left_delta="-260"
-         name="AvatarRenderingText"
-         top_pad="18"
-         width="128">
-        Avatar Rendering:
       </text>
+
       <check_box
-       control_name="RenderUseImpostors"
-       height="16"
-       initial_value="true"
-       label="Avatar impostors"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarImpostors"
-       top_pad="7"
-       width="256" />
+        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="RenderAvatarVP"
-       height="16"
-       initial_value="true"
-       label="Hardware skinning"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarVertexProgram"
-       top_pad="1"
-       width="256">
-          <check_box.commit_callback
-           function="Pref.VertexShaderEnable" />
+        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="RenderAvatarCloth"
-       height="16"
-       initial_value="true"
-       label="Avatar cloth"
-       layout="topleft"
-       left_delta="0"
-       name="AvatarCloth"
-       top_pad="1"
-       width="256" />
+        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="12"
-       layout="topleft"
-       left="407"
-       left_pad="-30"
-       name="TerrainDetailText"
-        top="250"
-       width="155">
-          Terrain detail:
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left_delta="264"
+        name="RenderShadowDetailText"
+        top_delta="0"
+        width="128">
+          None
       </text>
-      <radio_group
-       control_name="RenderTerrainDetail"
-       draw_border="false"
-       height="38"
-       layout="topleft"
-       left_delta="5"
-       name="TerrainDetailRadio"
-       top_pad="5"
-       width="70">
-          <radio_item
-           height="16"
-           label="Low"
-           layout="topleft"
-           name="0"
-           top="3"
-           width="50" />
-          <radio_item
-           height="16"
-           label="High"
-           layout="topleft"
-           name="2"
-           top_delta="16"
-           width="50" />
-      </radio_group> -->
-	</panel>
-	
-    <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="3"
-     name="Defaults"
-     top="390"
-     width="115">
-        <button.commit_callback
-         function="Pref.HardwareDefaults" />
-    </button>
-    <button
-     control_name="ShowAdvancedGraphicsSettings"
-     follows="right|bottom"
-     height="23"
-     is_toggle="true"
-     label="Advanced"
-     layout="topleft"
-     left_pad="35"
-     name="Advanced"
-     top_delta="0"
-     width="115" />
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Hardware"
-     label_selected="Hardware"
-     layout="topleft"
-     left_pad="3"
-     name="GraphicsHardwareButton"
-     top_delta="0"
-     width="115">
-        <button.commit_callback
-         function="Pref.HardwareSettings" />
-    </button>
+    </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>
 </panel>
-- 
cgit v1.2.3