From a37057717d243596b92108590d56a0d3021ad840 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 26 Aug 2010 14:02:51 -0400
Subject: Miscellaneous fixes for how we're doing graphics settings for the
 avatar physics. Fixed a cast issue that was causing a linux compile error.

---
 .../default/xui/en/panel_preferences_graphics1.xml | 64 +++++++++++-----------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins/default')

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 23024cd0eb..bd5473e7bf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -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"
@@ -482,24 +513,6 @@
             parameter="AvatarMeshDetailText" />
         </slider>
         <slider
-        control_name="RenderAvatarPhysicsLODFactor"
-        follows="left|top"
-        height="16"
-        increment="0.125"
-        initial_value="160"
-        label="  Avatar Physics:"
-        label_width="185"
-        layout="topleft"
-        left_delta="0"
-        name="AvatarPhysicsDetail"
-        show_text="false"
-        top_pad="4"
-        width="264">
-           <slider.commit_callback
-            function="Pref.UpdateSliderText"
-            parameter="AvatarPhysicsDetailText" />
-        </slider>
-        <slider
         control_name="RenderTerrainLODFactor"
         follows="left|top"
         height="16"
@@ -608,18 +621,6 @@
         height="12"
         layout="topleft"
         left_delta="0"
-        name="AvatarPhysicsDetailText"
-        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">
@@ -638,6 +639,7 @@
         width="128">
            Low
         </text>
+
       <text
       type="string"
       length="1"
@@ -648,7 +650,7 @@
       name="AvatarRenderingText"
         top_pad="18"
       width="128">
-        Avatar rendering:
+        Avatar Rendering:
       </text>
       <check_box
       control_name="RenderUseImpostors"
-- 
cgit v1.2.3