automated merge

1 files changed, 37 insertions, 5 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 113d5fb6dc..bd5473e7bf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel
  border="true"
  follows="left|top|right|bottom"
- height="408"
+ height="418"
  label="Graphics"
  layout="topleft"
  left="102"
@@ -317,6 +317,37 @@
         value="4"/>
       </combo_box>
     
+        <slider
+        control_name="RenderAvatarPhysicsLODFactor"
+        follows="left|top"
+        height="16"
+        increment="0.125"
+        initial_value="160"
+        label="  Avatar Physics:"
+        label_width="85"
+        layout="topleft"
+        left_delta="-6"
+        name="AvatarPhysicsDetail"
+        show_text="false"
+        top_pad="12"
+        width="154">
+           <slider.commit_callback
+            function="Pref.UpdateSliderText"
+            parameter="AvatarPhysicsDetailText" />
+        </slider>
+        <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="12"
+        layout="topleft"
+        left_delta="160"
+        name="AvatarPhysicsDetailText"
+        top_pad="-16"
+        width="128">
+           Low
+        </text>
+
 		<slider
 		control_name="RenderFarClip"
 		decimal_digits="0"
@@ -608,6 +639,7 @@
         width="128">
            Low
         </text>
+
       <text
       type="string"
       length="1"
@@ -618,7 +650,7 @@
       name="AvatarRenderingText"
         top_pad="18"
       width="128">
-        Avatar rendering:
+        Avatar Rendering:
       </text>
       <check_box
       control_name="RenderUseImpostors"
@@ -662,7 +694,7 @@
         left="358"
         left_pad="-30"
         name="TerrainDetailText"
-        top="226"
+        top="250"
         width="155">
            Terrain detail:
         </text>
@@ -700,7 +732,7 @@
      layout="topleft"
      left="10"
      name="Apply"
-     top="383"
+     top="390"
      width="115"
       >
         <button.commit_callback
@@ -713,7 +745,7 @@
      layout="topleft"
      left_pad="3"
      name="Defaults"
-     top="383"
+     top="390"
      width="115">
         <button.commit_callback
          function="Pref.HardwareDefaults" />