Pull merge from lindenlab/viewer-release

1 files changed, 108 insertions, 30 deletions

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 849f3ef73d..6c485c0595 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -47,7 +47,7 @@
         Better
     </text>
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -56,16 +56,15 @@
      top_delta="-2"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
      left_pad="41"
-     name="LowMidraphicsDivet"
-     top_delta="-2"
+     name="LowMidGraphicsDivet"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -74,7 +73,7 @@
      top_delta="0"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -83,7 +82,7 @@
      top_delta="0"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -92,7 +91,7 @@
      top_delta="0"
      width="2" />
   <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -101,7 +100,7 @@
      top_delta="0"
      width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -147,12 +146,12 @@
      height="12"
      layout="topleft"
      left_delta="87"
-     name="ShadersPrefText3"
+     name="ShadersPrefText2"
      top_delta="0"
      width="80">
         Mid
     </text>
-  <text
+    <text
      type="string"
      length="1"
      follows="left|top"
@@ -163,8 +162,8 @@
      name="ShadersPrefText3"
      top_delta="0"
      width="80">
-      High
-  </text>
+        High
+    </text>
     <text
      type="string"
      length="1"
@@ -178,10 +177,86 @@
      width="80">
         Ultra
     </text>
+  <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">
+    <slider.commit_callback
+     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
+  </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" />
+  <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
+  </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">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
     <panel
-	 visiblity_control="ShowAdvancedGraphicsSettings"
+	   visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
-	 follows="top|left"
+	   follows="top|left"
      height="300"
      label="CustomGraphics"
      layout="topleft"
@@ -211,24 +286,27 @@
 		 name="TransparentWater"
 		 top_pad="7"
 		 width="256" />
-		<check_box
-		 control_name="RenderObjectBump"
+      <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">
+        <check_box.commit_callback
+        function="Pref.VertexShaderEnable" />
+      </check_box>
+    <check_box
+		 control_name="RenderLocalLights"
 		 height="16"
 		 initial_value="true"
-		 label="Bump mapping and shiny"
+		 label="Local Lights"
 		 layout="topleft"
 		 left_delta="0"
-		 name="BumpShiny"
-		 top_pad="1"
-		width="256" />
-    <check_box
-		control_name="RenderLocalLights"
-		height="16"
-		initial_value="true"
-		label="Local Lights"
-		layout="topleft"
-		left_delta="0"
-		name="LocalLights"
+		 name="LocalLights"
 		 top_pad="1"
 		 width="256" />
 		  <check_box
@@ -262,7 +340,7 @@
 		 control_name="RenderDeferred"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advanced Lighting Model"
 		 layout="topleft"
 		 left_delta="0"
 		 name="UseLightShaders"