1 files changed, 67 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index b9259256a6..8c4019a668 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-  height="400"
+  height="411"
   layout="topleft"
   name="prefs_graphics_advanced"
   help_topic="Preferences_Graphics_Advanced"
@@ -102,6 +102,22 @@
     width="65">
        Low
   </text>
+  <slider
+    control_name="RenderLocalLightCount"
+    decimal_digits="0"
+    follows="left|top"
+    height="16"
+    increment="1"
+    initial_value="256"
+    label="Max. nearby lights:"
+    label_width="185"
+    layout="topleft"
+    left="30"
+    min_val="0"
+    max_val="8192"
+    name="MaxLights"
+    top_delta="16"
+    width="336" />
 
   <check_box
     control_name="RenderVSyncEnable"
@@ -128,6 +144,42 @@
      Avatar
   </text>
 
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="16"
+      layout="topleft"
+      left="30"
+      top_delta="16"
+      width="128"
+      name="AvatarComplexityModeLabel"
+      text_readonly_color="LabelDisabledColor">
+        Avatar display:
+    </text>
+
+    <combo_box
+     control_name="RenderAvatarComplexityMode"
+     height="18"
+     layout="topleft"
+     left_delta="130"
+     top_delta="0"
+     name="AvatarComplexityMode"
+     width="150">
+        <combo_box.item
+          label="Limit by complexity"
+          name="0"
+          value="0"/>
+        <combo_box.item
+          label="Always show friends"
+          name="1"
+          value="1"/>
+        <combo_box.item
+          label="Only show friends"
+          name="2"
+          value="2"/>
+    </combo_box>
+
   <slider
     control_name="IndirectMaxComplexity"
     tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
@@ -493,7 +545,7 @@
   </text>
    <view_border
       bevel_style="in"
-      height="322"
+      height="357"
       layout="topleft"
       left="385"
       name="vert_border"
@@ -812,21 +864,21 @@
    name="HeroProbeUpdateRate"
    width="150">
     <combo_box.item
-      label="Every Frame"
-      name="0"
-      value="1"/>
+      label="Low"
+      name="6"
+      value="6"/>
     <combo_box.item
-      label="Every 2nd Frame"
+      label="Medium"
+      name="3"
+      value="3"/>
+    <combo_box.item
+      label="High"
       name="1"
       value="2"/>
     <combo_box.item
-      label="Every 3rd Frame"
-      name="2"
-      value="3"/>
-    <combo_box.item
-      label="Every 4th Frame"
-      name="3"
-      value="4"/>
+      label="Ultra"
+      name="0"
+      value="1"/>
   </combo_box>
   <!-- End of mirror settings -->
 
@@ -837,7 +889,7 @@
       layout="topleft"
       left="13"
       name="horiz_border"
-      top="338"
+      top="373"
       top_delta="5"
       width="774"/>
   <button
@@ -847,7 +899,7 @@
     layout="topleft"
     left="20"
     name="Defaults"
-    top_delta="20"
+    top_delta="7"
     width="210">
     <button.commit_callback
       function="Pref.HardwareDefaults" />