merge latest avatar-physics updates

1 files changed, 298 insertions, 35 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 453ed1baf7..160b8f3408 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3795,6 +3795,18 @@
     </param>
 
     <param
+     id="1092"
+     group="1"
+     name="Belly_Torso_Physics_UpDown_Driven"
+     wearable="shape"
+     edit_group="driven"
+     value_default="0"
+     value_min="-1"
+     value_max="1">
+      <param_morph />
+    </param>
+
+    <param
      id="626"
      sex="female"
      group="1"
@@ -4048,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>
 
@@ -4066,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>
 
@@ -4389,6 +4391,18 @@
     </param>
 
     <param
+     id="1093"
+     group="1"
+     name="Belly_Legs_Physics_UpDown_Driven"
+     wearable="shape"
+     edit_group="driven"
+     value_min="-1"
+     value_max="1">
+      <param_morph />
+    </param>
+
+
+    <param
      id="151"
      group="1"
      name="Big_Butt_Legs"
@@ -4427,6 +4441,38 @@
     </param>
 
     <param
+     id="1089"
+     group="0"
+     name="Butt_Physics_UpDown_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="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"
      name="Muscular_Legs"
@@ -5140,6 +5186,18 @@
     </param>
 
     <param
+     id="1094"
+     group="1"
+     name="Belly_Skirt_Physics_UpDown_Driven"
+     wearable="skirt"
+     edit_group="driven"
+     cross_wearable="true"
+     value_min="-1"
+     value_max="1">
+      <param_morph />
+    </param>
+
+    <param
      id="850"
      group="1"
      wearable="skirt"
@@ -9083,9 +9141,9 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="2"
-     value_min="1"
-     value_max="5"
+     value_default=".1"
+     value_min=".1"
+     value_max="1"
      camera_elevation=".3"
      camera_distance=".8">
 	 <param_driver />
@@ -9137,9 +9195,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 />
@@ -9173,9 +9231,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 />
@@ -9191,9 +9249,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 />
@@ -9228,9 +9286,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 />
@@ -9246,7 +9304,7 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="50"
+     value_default="10"
      value_min="1"
      value_max="100"
      camera_elevation=".3"
@@ -9264,9 +9322,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 />
@@ -9282,9 +9340,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 />
@@ -9300,7 +9358,7 @@ render_pass="bump">
      edit_group="physics"
      label_min="Less"
      label_max="More"
-     value_default="1"
+     value_default="0"
      value_min="0"
      value_max="10"
      camera_elevation=".3"
@@ -9308,18 +9366,60 @@ render_pass="bump">
 	 <param_driver />
     </param>
 
+    <param
+     id="1104"
+     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="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"
      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"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default="0"
      value_min="-1.5"
      value_max="2"
      camera_elevation=".3"
@@ -9334,14 +9434,14 @@ 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"
      label_min="Less"
      label_max="More"
-     value_default="10"
+     value_default="0"
      value_min="-.3"
      value_max="1.3"
      camera_elevation=".3"
@@ -10076,6 +10176,169 @@ render_pass="bump">
     </param>
 
     <param
+     id="1091"
+     group="0"
+     wearable="shape"
+     edit_group="shape_torso"
+     edit_group_order="14"
+     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"
+     camera_angle="30"
+     camera_elevation=".2">
+      <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="0"
+     value_min="0"
+     value_max="10"
+     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="0"
+     value_min="0"
+     value_max="10"
+     camera_elevation=".3"
+     camera_distance=".8">
+	 <param_driver />
+    </param>
+
+
+    <param
      id="637"
      group="0"
      wearable="shape"