From 356db2b9b9e2c04d50cc37d0101f559b190f3578 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 21 Oct 2013 12:55:51 -0500
Subject: MAINT-3311 Add avatar_lad and avatar_skeleton changes from Jeremiah

---
 indra/newview/character/avatar_lad.xml | 148 ++++++++++++++++++++++++++++++---
 1 file changed, 136 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 e5b385f4aa..b615d8d469 100755
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3826,6 +3826,10 @@
           name="BELLY"
           scale="0.075 0.04 0.03"
           pos="0.07 0 -0.07"/>
+        <volume_morph
+          name="STOMACH"
+          scale="0.0272 0.0272 0.0272"
+          pos="0.132 -0.016 0.0"/>
       </param_morph>
     </param>
 
@@ -3844,7 +3848,16 @@
      camera_elevation=".1"
      camera_distance="1"
      camera_angle="15">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0273 0.0273 0.0273"
+          pos="0.038 0.024 -0.016"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0273 0.0273 0.0273"
+          pos="0.038 -0.024 -0.016"/>
+	  </param_morph>
     </param>
 
     <param
@@ -3861,7 +3874,16 @@
      value_max="1"
      camera_elevation="0"
      camera_distance=".28">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 -0.027 0.007"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.027 0.007"/>
+	  </param_morph>
     </param>
 
     <param
@@ -3878,7 +3900,16 @@
      value_max="1"
      camera_elevation="0"
      camera_distance=".28">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 -0.035 0.009"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.035 0.009"/>
+	  </param_morph>
     </param>
 
     <param
@@ -4041,6 +4072,18 @@
           name="CHEST"
           scale="0.02 0.03 0.03"
           pos="0 0 -0.03"/>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0367 0.0367 0.016"
+          pos="0.031 -0.005 -0.013"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0367 0.0367 0.016"
+          pos="0.031 0.005 -0.013"/>
+        <volume_morph
+          name="STOMACH"
+          scale="0.0426 0.0426 0.0426"
+          pos="0.077 0.0 -0.0"/>
         <volume_morph
           name="BELLY"
           scale="0.09 0.08 0.07"
@@ -4093,7 +4136,16 @@
      value_max="2"
      camera_elevation=".3"
      camera_distance=".8">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.004 0.0 -0.01"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.004 0.0 -0.01"/>
+      </param_morph>
     </param>
     
     <param
@@ -4143,6 +4195,12 @@
         <volume_morph
           name="BELLY"
           scale="0.0 0.02 0.0"/>
+        <volume_morph
+          name="LEFT_HANDLE"
+          pos="0.0 0.025 0.0"/>
+        <volume_morph
+          name="RIGHT_HANDLE"
+          pos="0.0 -0.025 0.0"/>
       </param_morph>
     </param>
 
@@ -4162,7 +4220,16 @@
      value_max="1.3"
      camera_elevation=".3"
      camera_distance=".8">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 -0.026 0.0"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.026 0.0"/>
+      </param_morph>
     </param>
     
     <param
@@ -4181,7 +4248,16 @@
      value_max="1.1"
      camera_elevation=".3"
      camera_distance="1.2">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.01 -0.024 0.008"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="-0.01 0.024 0.008"/>
+      </param_morph>
     </param>
 
     <!-- ############# # 
@@ -4205,6 +4281,14 @@
           name="BELLY"
           scale="0.03 0.03 0.0"
           pos="-0.03 0 0.02"/>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.008 -0.03 0.01"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.008 0.03 0.01"/>
         <volume_morph
           name="L_CLAVICLE"
           scale="0.02 0.0 0.01"
@@ -4376,7 +4460,16 @@
      value_default="0"
      value_min="-3"
      value_max="3">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.0 -0.01"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.0 -0.01"/>
+	  </param_morph>
     </param>
 
     <param
@@ -4389,7 +4482,16 @@
      value_default="0"
      value_min="-1.25"
      value_max="1.25">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 -0.026 0.0"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.026 -0.0"/>
+	  </param_morph>
     </param>
 
     <param
@@ -4402,7 +4504,12 @@
      value_default="0"
      value_min="-1"
      value_max="1">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="STOMACH"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.0 0.05"/>
+	  </param_morph>
     </param>
 
     <param
@@ -4415,7 +4522,16 @@
      value_default="0"
      value_min="-2"
      value_max="2">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="LEFT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.03 0.0"/>
+        <volume_morph
+          name="RIGHT_PEC"
+          scale="0.0 0.0 0.0"
+          pos="0.0 0.03 0.0"/>
+	  </param_morph>
     </param>
 
     <!--
@@ -4949,7 +5065,11 @@
      value_default="0"
      value_min="-1"
      value_max="1">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="BUTT"
+          pos="0.0 0.0 0.05"/>
+	  </param_morph>
     </param>
 
     <param
@@ -4962,7 +5082,11 @@
      value_default="0"
      value_min="-1"
      value_max="1">
-      <param_morph />
+      <param_morph>
+        <volume_morph
+          name="BUTT"
+          pos="0.0 0.05 0.0"/>
+	  </param_morph>
     </param>
 
     <!--
-- 
cgit v1.2.3


From b8f1e2a7704bdac5ef270be21918317a17f77b2a Mon Sep 17 00:00:00 2001
From: "jeremiah@lindenlab.com" <jeremiah@lindenlab.com>
Date: Wed, 6 Nov 2013 11:30:39 -0500
Subject: updated avatar files

---
 indra/newview/character/avatar_lad.xml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 indra/newview/character/avatar_lad.xml

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

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
old mode 100755
new mode 100644
index b615d8d469..884d16b94b
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3826,10 +3826,6 @@
           name="BELLY"
           scale="0.075 0.04 0.03"
           pos="0.07 0 -0.07"/>
-        <volume_morph
-          name="STOMACH"
-          scale="0.0272 0.0272 0.0272"
-          pos="0.132 -0.016 0.0"/>
       </param_morph>
     </param>
 
@@ -4080,10 +4076,6 @@
           name="RIGHT_PEC"
           scale="0.0367 0.0367 0.016"
           pos="0.031 0.005 -0.013"/>
-        <volume_morph
-          name="STOMACH"
-          scale="0.0426 0.0426 0.0426"
-          pos="0.077 0.0 -0.0"/>
         <volume_morph
           name="BELLY"
           scale="0.09 0.08 0.07"
@@ -4244,7 +4236,7 @@
      label_min="Big Pectorals"
      label_max="Sunken Chest"
      value_default="0"
-     value_min="-.5"
+     value_min="-1.0"
      value_max="1.1"
      camera_elevation=".3"
      camera_distance="1.2">
@@ -4252,11 +4244,11 @@
         <volume_morph
           name="LEFT_PEC"
           scale="0.0 0.0 0.0"
-          pos="0.01 -0.024 0.008"/>
+          pos="-0.01 -0.024 -0.05"/>
         <volume_morph
           name="RIGHT_PEC"
           scale="0.0 0.0 0.0"
-          pos="-0.01 0.024 0.008"/>
+          pos="-0.01 0.024 -0.05"/>
       </param_morph>
     </param>
 
@@ -4275,8 +4267,8 @@
       <param_morph>
         <volume_morph
           name="CHEST"
-          scale="0.03 0.04 0.02"
-          pos="-0.03 0 -0.01"/>
+          scale="0 0 0"
+          pos="0 0 0"/>
         <volume_morph
           name="BELLY"
           scale="0.03 0.03 0.0"
@@ -4506,7 +4498,7 @@
      value_max="1">
       <param_morph>
         <volume_morph
-          name="STOMACH"
+          name="BELLY"
           scale="0.0 0.0 0.0"
           pos="0.0 0.0 0.05"/>
 	  </param_morph>
@@ -4634,6 +4626,10 @@
           name="PELVIS"
           scale="-0.01 0.0 0.0"
           pos="0.01 0 0.0"/>
+        <volume_morph
+          name="BUTT"
+          scale="0.0 0.0886 0.0"
+          pos="0.03 0 0.0"/>
       </param_morph>
     </param>
 
-- 
cgit v1.2.3


From dd7b0f96157bdfbdd8892cc8aa209182ae777380 Mon Sep 17 00:00:00 2001
From: "jeremiah@lindenlab.com" <jeremiah@lindenlab.com>
Date: Wed, 13 Nov 2013 14:44:46 -0500
Subject: correct some male/female shape differences

---
 indra/newview/character/avatar_lad.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 884d16b94b..4631e012fd 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -4267,8 +4267,8 @@
       <param_morph>
         <volume_morph
           name="CHEST"
-          scale="0 0 0"
-          pos="0 0 0"/>
+          scale="0.03 0.04 0.02"
+          pos="-0.03 0 -0.01"/>
         <volume_morph
           name="BELLY"
           scale="0.03 0.03 0.0"
-- 
cgit v1.2.3


From 83c62e7094df5ae355efc11b26ac6aa0b0c60da0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 3 Dec 2013 09:25:30 -0500
Subject: Update based on first project viewer tests. Two more bones to better
 address back deformation: UPPER_BACK and LOWER_BACK Better deformation for
 breasts, belly, upper and lower back (seen using the Body Fat and Belly Size
 sliders) Minor tweaks in the avatar_lad.xml file for a few other minor
 shapes. Small typo bug (FITMESH-2) Updated rigs and corrected female mesh
 Removed skeleton-only files so that people all start from the same base
 meshes with example skinning These updates specifically address the following
 bugs: FITMESH-2, FITMESH-4, FITMESH-5, FITMESH-7, FITMESH-10 (.ma formats,
 not .dae)

---
 indra/newview/character/avatar_lad.xml | 59 ++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 indra/newview/character/avatar_lad.xml

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

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
old mode 100644
new mode 100755
index 4631e012fd..5268498d56
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3825,7 +3825,11 @@
         <volume_morph
           name="BELLY"
           scale="0.075 0.04 0.03"
-          pos="0.07 0 -0.07"/>
+          pos="0.07 0 -0.02"/>
+        <volume_morph
+          name="PELVIS"
+          scale="0.075 0.04 0.03"
+          pos="0.07 0 -0.02"/>
       </param_morph>
     </param>
 
@@ -3873,12 +3877,12 @@
       <param_morph>
         <volume_morph
           name="LEFT_PEC"
-          scale="0.0 0.0 0.0"
-          pos="0.0 -0.027 0.007"/>
+          scale="-0.05 0.0 0.0"
+          pos="-0.01 -0.01 -0.02"/>
         <volume_morph
           name="RIGHT_PEC"
-          scale="0.0 0.0 0.0"
-          pos="0.0 0.027 0.007"/>
+          scale="-0.05 0.0 0.0"
+          pos="-0.01 -0.01 -0.02"/>
 	  </param_morph>
     </param>
 
@@ -3899,12 +3903,12 @@
       <param_morph>
         <volume_morph
           name="LEFT_PEC"
-          scale="0.0 0.0 0.0"
-          pos="0.0 -0.035 0.009"/>
+          scale="-0.051 0.0 0.0"
+          pos="-0.02 -0.01 -0.03"/>
         <volume_morph
           name="RIGHT_PEC"
-          scale="0.0 0.0 0.0"
-          pos="0.0 0.035 0.009"/>
+          scale="-0.051 0.0 0.0"
+          pos="-0.02 -0.01 -0.03"/>
 	  </param_morph>
     </param>
 
@@ -3970,6 +3974,10 @@
           name="BELLY"
           scale="0.0 -0.01 0.0"
           pos="0.0 0.0 0"/>
+        <volume_morph
+          name="UPPER_BACK"
+          scale="-0.01 -0.01 0.0"
+          pos="0.0 0.0 0"/>
         <volume_morph
           name="CHEST"
           scale="-0.01 -0.01 0.0"
@@ -4020,6 +4028,10 @@
           name="BELLY"
           scale="-0.01 -0.01 0.0"
           pos="0.01 0.0 0"/>
+        <volume_morph
+          name="UPPER_BACK"
+          scale="-0.01 -0.01 0.0"
+          pos="0.0 0.0 0"/>
         <volume_morph
           name="CHEST"
           scale="-0.02 -0.02 0.0"
@@ -4068,14 +4080,32 @@
           name="CHEST"
           scale="0.02 0.03 0.03"
           pos="0 0 -0.03"/>
+        <volume_morph
+          name="PELVIS"
+          scale="0.02 0.03 0.03"
+          pos="0 0 -0.03"/>
+        <volume_morph
+          name="UPPER_BACK"
+          scale="0.01 0.03 0.0"
+          pos="-0.03 0 0"/>
+        <volume_morph
+          name="LOWER_BACK"
+          scale="0.04 0.06 0.0"
+          pos="-0.06 0 0"/>
+        <volume_morph
+          name="LEFT_HANDLE"
+          pos="0.0 0.08 0.0"/>
+        <volume_morph
+          name="RIGHT_HANDLE"
+          pos="0.0 -0.08 0.0"/>
         <volume_morph
           name="LEFT_PEC"
           scale="0.0367 0.0367 0.016"
-          pos="0.031 -0.005 -0.013"/>
+          pos="0.00 -0.005 -0.013"/>
         <volume_morph
           name="RIGHT_PEC"
           scale="0.0367 0.0367 0.016"
-          pos="0.031 0.005 -0.013"/>
+          pos="0.00 0.005 -0.013"/>
         <volume_morph
           name="BELLY"
           scale="0.09 0.08 0.07"
@@ -4187,6 +4217,9 @@
         <volume_morph
           name="BELLY"
           scale="0.0 0.02 0.0"/>
+        <volume_morph
+          name="LOWER_BACK"
+          scale="0.0 0.02 0.0"/>
         <volume_morph
           name="LEFT_HANDLE"
           pos="0.0 0.025 0.0"/>
@@ -4244,11 +4277,11 @@
         <volume_morph
           name="LEFT_PEC"
           scale="0.0 0.0 0.0"
-          pos="-0.01 -0.024 -0.05"/>
+          pos="-0.03 -0.024 -0.01"/>
         <volume_morph
           name="RIGHT_PEC"
           scale="0.0 0.0 0.0"
-          pos="-0.01 0.024 -0.05"/>
+          pos="-0.03 0.024 -0.01"/>
       </param_morph>
     </param>
 
-- 
cgit v1.2.3