From 3825ee503ddab29cf408ae35f5a43bcc154353f2 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Thu, 17 Mar 2011 17:36:01 -0400
Subject: Work in progress.  Big code cleanup ported from
 TheShining/avatar-physics (defunct branch). Added butt and belly.

---
 indra/newview/character/avatar_lad.xml | 76 ++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 453ed1baf7..c4117da893 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3794,6 +3794,23 @@
       </param_morph>
     </param>
 
+    <param
+     id="1091"
+     group="0"
+     name="Belly_Gravity"
+     label="Belly Gravity"
+     wearable="shape"
+     edit_group="driven"
+     label_min="Up"
+     label_max="Down"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_morph />
+    </param>
+
     <param
      id="626"
      sex="female"
@@ -4426,6 +4443,23 @@
       </param_morph>
     </param>
 
+    <param
+     id="1089"
+     group="0"
+     name="Butt_Gravity"
+     label="Butt Gravity"
+     wearable="shape"
+     edit_group="driven"
+     label_min="Separate"
+     label_max="Join"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_morph />
+    </param>
+
     <param
      id="152"
      group="1"
@@ -9352,6 +9386,48 @@ render_pass="bump">
 	</param_driver>
     </param>
 
+   <param
+     id="1090"
+     group="0"
+     name="Butt_Gravity_Driver"
+     label="Butt Gravity"
+     wearable="shape"
+     edit_group="shape_legs"
+     edit_group_order="7"
+     label_min="Less"
+     label_max="More"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1089" />
+	</param_driver>
+    </param>
+
+   <param
+     id="1092"
+     group="0"
+     name="Belly_Gravity_Driver"
+     label="Belly Gravity"
+     wearable="shape"
+     edit_group="shape_torso"
+     edit_group_order="14"
+     label_min="Less"
+     label_max="More"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1090" />
+	</param_driver>
+    </param>
+
     <param
      id="828"
      group="0"
-- 
cgit v1.2.3


From c754a7c0000d6f1defd58d7e8b4587d46ee1defe Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 10:16:03 -0400
Subject: Enabling for belly vertical motion.

---
 indra/newview/character/avatar_lad.xml | 80 ++++++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 24 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index c4117da893..6dbda4fd16 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3795,10 +3795,10 @@
     </param>
 
     <param
-     id="1091"
+     id="1092"
      group="0"
-     name="Belly_Gravity"
-     label="Belly Gravity"
+     name="Big_Belly_Torso_Gravity"
+     label="Big Belly Torso Gravity"
      wearable="shape"
      edit_group="driven"
      label_min="Up"
@@ -4405,6 +4405,18 @@
       <param_morph />
     </param>
 
+    <param
+     id="1093"
+     group="1"
+     name="Big_Belly_Legs_Gravity"
+     wearable="shape"
+     edit_group="driven"
+     value_min="-2"
+     value_max="2">
+      <param_morph />
+    </param>
+
+
     <param
      id="151"
      group="1"
@@ -5173,6 +5185,19 @@
       <param_morph />
     </param>
 
+    <param
+     id="1094"
+     group="1"
+     name="skirt_belly_gravity"
+     wearable="skirt"
+     edit_group="driven"
+     cross_wearable="true"
+     label="big belly skirt gravity"
+     value_min="0"
+     value_max="1">
+      <param_morph />
+    </param>
+
     <param
      id="850"
      group="1"
@@ -9407,27 +9432,6 @@ render_pass="bump">
 	</param_driver>
     </param>
 
-   <param
-     id="1092"
-     group="0"
-     name="Belly_Gravity_Driver"
-     label="Belly Gravity"
-     wearable="shape"
-     edit_group="shape_torso"
-     edit_group_order="14"
-     label_min="Less"
-     label_max="More"
-     value_default="0"
-     value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
-      <param_driver>
-        <driven
-         id="1090" />
-	</param_driver>
-    </param>
-
     <param
      id="828"
      group="0"
@@ -10151,6 +10155,34 @@ render_pass="bump">
       </param_driver>
     </param>
 
+    <param
+     id="1091"
+     group="0"
+     wearable="shape"
+     edit_group="shape_torso"
+     edit_group_order="14"
+     name="Belly_Gravity"
+     label="Belly Gravity"
+     label_min="Small"
+     label_max="Big"
+     value_min="0"
+     value_max="1"
+     value_default="0"
+     camera_distance="1.4"
+     camera_angle="30"
+     camera_elevation=".2">
+      <param_driver>
+        <driven
+         id="1092" />
+
+        <driven
+         id="1093" />
+
+        <driven
+         id="1094" />
+      </param_driver>
+    </param>
+
     <param
      id="637"
      group="0"
-- 
cgit v1.2.3


From d55f816fb15eab67abb72997b2eb589fff16f4ee Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 14:54:30 -0400
Subject: Some code cleanup.  Changed equations to occur in normalized (0,1)
 space instead of parameter space.

---
 indra/newview/character/avatar_lad.xml | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 6dbda4fd16..0fc62ccaf1 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -9142,9 +9142,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="2"
-     value_min="1"
-     value_max="5"
+     value_default=".2"
+     value_min=".1"
+     value_max=".5"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9180,7 +9180,7 @@ render_pass="bump">
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="1"
+     value_max="100"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9215,7 +9215,7 @@ render_pass="bump">
      label_min="Less"
      label_max="More"
      value_default="10"
-     value_min="1"
+     value_min="0"
      value_max="100"
      camera_elevation=".3"
      camera_distance=".8">
@@ -9232,9 +9232,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".5"
+     value_default=".05"
      value_min="0"
-     value_max="1"
+     value_max=".1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9250,9 +9250,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default=".15"
      value_min="0"
-     value_max="1"
+     value_max=".5"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9268,7 +9268,7 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="0"
+     value_default="10"
      value_min="0"
      value_max="10"
      camera_elevation=".3"
@@ -9287,9 +9287,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="1.5"
+     value_default=".1"
      value_min="0"
-     value_max="10"
+     value_max="1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9305,8 +9305,8 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="50"
-     value_min="1"
+     value_default="10"
+     value_min="0"
      value_max="100"
      camera_elevation=".3"
      camera_distance=".8">
@@ -9323,9 +9323,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default=".05"
      value_min="0"
-     value_max="1"
+     value_max=".1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9341,9 +9341,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default=".15"
      value_min="0"
-     value_max="1"
+     value_max=".5"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9359,7 +9359,7 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="1"
+     value_default="10"
      value_min="0"
      value_max="10"
      camera_elevation=".3"
@@ -9378,7 +9378,7 @@ render_pass="bump">
      edit_group_order="7"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default="0"
      value_min="-1.5"
      value_max="2"
      camera_elevation=".3"
@@ -9400,7 +9400,7 @@ render_pass="bump">
      edit_group_order="8"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default="0"
      value_min="-.3"
      value_max="1.3"
      camera_elevation=".3"
-- 
cgit v1.2.3


From 86613fd388d7985abc814ee8ee52da54fd74779e Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 16:04:28 -0400
Subject: Variety of fixes for param ranges. Turned off normal/binormal effects
 for morphing. Fixed issue where updates were always being sent even if below
 the change threshold.

---
 indra/newview/character/avatar_lad.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 0fc62ccaf1..727a9e7fc4 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -9180,7 +9180,7 @@ render_pass="bump">
      label_max="More"
      value_default="0"
      value_min="0"
-     value_max="100"
+     value_max="1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9196,9 +9196,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="3"
+     value_default=".1"
      value_min="0"
-     value_max="10"
+     value_max="1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9215,7 +9215,7 @@ render_pass="bump">
      label_min="Less"
      label_max="More"
      value_default="10"
-     value_min="0"
+     value_min="1"
      value_max="100"
      camera_elevation=".3"
      camera_distance=".8">
@@ -9268,9 +9268,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default=".1"
      value_min="0"
-     value_max="10"
+     value_max=".1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9306,7 +9306,7 @@ render_pass="bump">
      label_min="Less"
      label_max="More"
      value_default="10"
-     value_min="0"
+     value_min="1"
      value_max="100"
      camera_elevation=".3"
      camera_distance=".8">
@@ -9359,9 +9359,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default=".1"
      value_min="0"
-     value_max="10"
+     value_max=".1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
-- 
cgit v1.2.3


From 53a944f2859d07eceed2a01a6b4f7339c0c591d9 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:02:27 -0400
Subject: Set default parameters. Renamed various parameters.

---
 indra/newview/character/avatar_lad.xml | 194 ++++++++++++++++++++++++++-------
 1 file changed, 156 insertions(+), 38 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 727a9e7fc4..08102332d0 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3796,18 +3796,13 @@
 
     <param
      id="1092"
-     group="0"
-     name="Big_Belly_Torso_Gravity"
-     label="Big Belly Torso Gravity"
+     group="1"
+     name="Belly_Torso_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
-     label_min="Up"
-     label_max="Down"
      value_default="0"
      value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="2">
       <param_morph />
     </param>
 
@@ -4065,16 +4060,11 @@
      group="0"
      sex="female"
      name="Breast_Gravity"
-     label="Breast Buoyancy"
      wearable="shape"
      edit_group="driven"
-     label_min="Less Gravity"
-     label_max="More Gravity"
      value_default="0"
      value_min="-1.5"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="2">
       <param_morph />
     </param>
 
@@ -4083,16 +4073,11 @@
      group="0"
      sex="female"
      name="Breast_Female_Cleavage"
-     label="Breast Cleavage"
      wearable="shape"
      edit_group="driven"
-     label_min="Separate"
-     label_max="Join"
      value_default="0"
      value_min="-.3"
-     value_max="1.3"
-     camera_elevation=".3"
-     camera_distance=".8">
+     value_max="1.3">
       <param_morph />
     </param>
 
@@ -4408,7 +4393,7 @@
     <param
      id="1093"
      group="1"
-     name="Big_Belly_Legs_Gravity"
+     name="Belly_Legs_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      value_min="-2"
@@ -4458,8 +4443,7 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Gravity"
-     label="Butt Gravity"
+     name="Butt_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -5188,11 +5172,10 @@
     <param
      id="1094"
      group="1"
-     name="skirt_belly_gravity"
+     name="Belly_Skirt_Physics_UpDown_Driven"
      wearable="skirt"
      edit_group="driven"
      cross_wearable="true"
-     label="big belly skirt gravity"
      value_min="0"
      value_max="1">
       <param_morph />
@@ -9371,8 +9354,8 @@ render_pass="bump">
      id="507"
      group="0"
      sex="female"
-     name="Breast_Gravity_Driver"
-     label="Breast Buoyancy"
+     name="Breast_Physics_UpDown_Controller"
+     label="Breast Physics UpDown Controller"
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="7"
@@ -9393,8 +9376,8 @@ render_pass="bump">
      id="684"
      group="0"
      sex="female"
-     name="Breast_Female_Cleavage_Driver"
-     label="Breast Cleavage"
+     name="Breast_Physics_Side_Controller"
+     label="Breast Physics Side Controller"
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="8"
@@ -9414,8 +9397,8 @@ render_pass="bump">
    <param
      id="1090"
      group="0"
-     name="Butt_Gravity_Driver"
-     label="Butt Gravity"
+     name="Butt_Physics_UpDown_Controller"
+     label="Butt Physics UpDown Controller"
      wearable="shape"
      edit_group="shape_legs"
      edit_group_order="7"
@@ -10161,11 +10144,11 @@ render_pass="bump">
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="14"
-     name="Belly_Gravity"
-     label="Belly Gravity"
-     label_min="Small"
-     label_max="Big"
-     value_min="0"
+     name="Belly_Physics_UpDown_Controller"
+     label="Belly Physics UpDown Controller"
+     label_min="Down"
+     label_max="Up"
+     value_min="-1"
      value_max="1"
      value_default="0"
      camera_distance="1.4"
@@ -10174,15 +10157,150 @@ render_pass="bump">
       <param_driver>
         <driven
          id="1092" />
-
         <driven
          id="1093" />
-
         <driven
          id="1094" />
       </param_driver>
     </param>
 
+    <param
+     id="1095"
+     group="0"
+     name="Belly_Physics_UpDown_Spring"
+     label="Belly Physics UpDown Spring"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max="1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1096"
+     group="0"
+     name="Belly_Physics_UpDown_Gain"
+     label="Belly Physics UpDown Gain"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default="10"
+     value_min="1"
+     value_max="100"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1097"
+     group="0"
+     name="Belly_Physics_UpDown_Damping"
+     label="Belly Physics UpDown Damping"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".05"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1098"
+     group="0"
+     name="Belly_Physics_UpDown_Max_Velocity"
+     label="Belly Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1100"
+     group="0"
+     name="Butt_Physics_UpDown_Spring"
+     label="Butt Physics UpDown Spring"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max="1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1101"
+     group="0"
+     name="Butt_Physics_UpDown_Gain"
+     label="Butt Physics UpDown Gain"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default="10"
+     value_min="1"
+     value_max="100"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1102"
+     group="0"
+     name="Butt_Physics_UpDown_Damping"
+     label="Butt Physics UpDown Damping"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".05"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+    <param
+     id="1103"
+     group="0"
+     name="Butt_Physics_UpDown_Max_Velocity"
+     label="Butt Physics UpDown Max Speed"
+     wearable="physics"
+     edit_group="physics"
+     label_min="Less"
+     label_max="More"
+     value_default=".1"
+     value_min="0"
+     value_max=".1"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+
     <param
      id="637"
      group="0"
-- 
cgit v1.2.3


From f2b65e07d0446e8db43b588a3c9e7fa93b7bcebe Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:06:10 -0400
Subject: Took out unnecessary Butt Physics parameter.

---
 indra/newview/character/avatar_lad.xml | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 08102332d0..1c3f87373c 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -4443,7 +4443,7 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Physics_UpDown_Driven"
+     name="Butt_Physics_UpDown_Controller"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -9394,27 +9394,6 @@ render_pass="bump">
 	</param_driver>
     </param>
 
-   <param
-     id="1090"
-     group="0"
-     name="Butt_Physics_UpDown_Controller"
-     label="Butt Physics UpDown Controller"
-     wearable="shape"
-     edit_group="shape_legs"
-     edit_group_order="7"
-     label_min="Less"
-     label_max="More"
-     value_default="0"
-     value_min="-2"
-     value_max="2"
-     camera_elevation=".3"
-     camera_distance=".8">
-      <param_driver>
-        <driven
-         id="1089" />
-	</param_driver>
-    </param>
-
     <param
      id="828"
      group="0"
-- 
cgit v1.2.3


From fc207f935a8d18e7927277f1aa713eb36cc36587 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:19:25 -0400
Subject: Fixed params for belly morph.  Incorrect params were causing
 distortion in texture maps.

---
 indra/newview/character/avatar_lad.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 1c3f87373c..b839d64980 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3801,8 +3801,8 @@
      wearable="shape"
      edit_group="driven"
      value_default="0"
-     value_min="-2"
-     value_max="2">
+     value_min="0"
+     value_max="1">
       <param_morph />
     </param>
 
@@ -4396,8 +4396,8 @@
      name="Belly_Legs_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
-     value_min="-2"
-     value_max="2">
+     value_min="0"
+     value_max="1">
       <param_morph />
     </param>
 
-- 
cgit v1.2.3


From 49e449e3a6ea08a969a214ffb7c66ac9607e2732 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 18 Mar 2011 18:59:59 -0400
Subject: Added more belly bounce.  Added butt driver param back in.

---
 indra/newview/character/avatar_lad.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index b839d64980..58fe82da9e 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -4443,7 +4443,7 @@
     <param
      id="1089"
      group="0"
-     name="Butt_Physics_UpDown_Controller"
+     name="Butt_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
      label_min="Separate"
@@ -9350,6 +9350,27 @@ render_pass="bump">
 	 <param_driver />
     </param>
 
+    <param
+     id="1090"
+     group="0"
+     wearable="shape"
+     edit_group="shape_legs"
+     edit_group_order="14"
+     name="Butt_Physics_UpDown_Controller"
+     label="Butt Physics UpDown Controller"
+     label_min="Down"
+     label_max="Up"
+     value_min="-1"
+     value_max="1"
+     value_default="0"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1089" />
+      </param_driver>
+    </param>
+
    <param
      id="507"
      group="0"
-- 
cgit v1.2.3


From 717d81daa7f42d18ca37eb738ceacfe2b9c1a09a Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Mar 2011 12:04:31 -0400
Subject: Added left-right butt control. Did a bunch of code cleanup.

---
 indra/newview/character/avatar_lad.xml | 39 +++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 58fe82da9e..69512cdf34 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -4456,6 +4456,22 @@
       <param_morph />
     </param>
 
+    <param
+     id="1090"
+     group="0"
+     name="Butt_Physics_LeftRight_Driven"
+     wearable="shape"
+     edit_group="driven"
+     label_min="Separate"
+     label_max="Join"
+     value_default="0"
+     value_min="-2"
+     value_max="2"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_morph />
+    </param>
+
     <param
      id="152"
      group="1"
@@ -9351,7 +9367,7 @@ render_pass="bump">
     </param>
 
     <param
-     id="1090"
+     id="1104"
      group="0"
      wearable="shape"
      edit_group="shape_legs"
@@ -9371,6 +9387,27 @@ render_pass="bump">
       </param_driver>
     </param>
 
+    <param
+     id="1105"
+     group="0"
+     wearable="shape"
+     edit_group="shape_legs"
+     edit_group_order="15"
+     name="Butt_Physics_LeftRight_Controller"
+     label="Butt Physics LeftRight Controller"
+     label_min="Down"
+     label_max="Up"
+     value_min="-1"
+     value_max="1"
+     value_default="0"
+     camera_elevation=".3"
+     camera_distance=".8">
+      <param_driver>
+        <driven
+         id="1090" />
+      </param_driver>
+    </param>
+
    <param
      id="507"
      group="0"
-- 
cgit v1.2.3


From 209110d1aa7ee369ccdf68641c3d7f9e558427de Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Mar 2011 15:39:42 -0400
Subject: Velocity now gets zeroed out if the param is pushed beyond limits.
 Rescaled the max speed param.

---
 indra/newview/character/avatar_lad.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 69512cdf34..d8f6fd56b3 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3801,7 +3801,7 @@
      wearable="shape"
      edit_group="driven"
      value_default="0"
-     value_min="0"
+     value_min="-1"
      value_max="1">
       <param_morph />
     </param>
@@ -4396,7 +4396,7 @@
      name="Belly_Legs_Physics_UpDown_Driven"
      wearable="shape"
      edit_group="driven"
-     value_min="0"
+     value_min="-1"
      value_max="1">
       <param_morph />
     </param>
@@ -9141,9 +9141,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".2"
+     value_default=".1"
      value_min=".1"
-     value_max=".5"
+     value_max="1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9267,9 +9267,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default="0"
      value_min="0"
-     value_max=".1"
+     value_max="10"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9358,9 +9358,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default="0"
      value_min="0"
-     value_max=".1"
+     value_max="10"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -10261,9 +10261,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default="0"
      value_min="0"
-     value_max=".1"
+     value_max="10"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -10329,9 +10329,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default=".1"
+     value_default="0"
      value_min="0"
-     value_max=".1"
+     value_max="10"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
-- 
cgit v1.2.3


From 45a43256ae71ec7936fc73e3b9c41470a23dd229 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 21 Mar 2011 16:18:02 -0400
Subject: Fixed skirt-related belly bounce.

---
 indra/newview/character/avatar_lad.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/character/avatar_lad.xml')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index d8f6fd56b3..160b8f3408 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -5192,7 +5192,7 @@
      wearable="skirt"
      edit_group="driven"
      cross_wearable="true"
-     value_min="0"
+     value_min="-1"
      value_max="1">
       <param_morph />
     </param>
-- 
cgit v1.2.3