summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeremiah@lindenlab.com <jeremiah@lindenlab.com>2013-11-06 11:30:39 -0500
committerjeremiah@lindenlab.com <jeremiah@lindenlab.com>2013-11-06 11:30:39 -0500
commitb8f1e2a7704bdac5ef270be21918317a17f77b2a (patch)
tree0220bfc770427c6c110544d3062ba5f803ff99d5
parent356db2b9b9e2c04d50cc37d0101f559b190f3578 (diff)
updated avatar files
-rw-r--r--[-rwxr-xr-x]indra/newview/character/avatar_lad.xml24
-rw-r--r--[-rwxr-xr-x]indra/newview/character/avatar_skeleton.xml7
2 files changed, 13 insertions, 18 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index b615d8d469..884d16b94b 100755..100644
--- 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>
@@ -4081,10 +4077,6 @@
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"
pos="0 0 -0.05"/>
@@ -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>
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
index 48cf419246..7ab20f8c6b 100755..100644
--- a/indra/newview/character/avatar_skeleton.xml
+++ b/indra/newview/character/avatar_skeleton.xml
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
-<linden_skeleton version="1.0" num_bones="52" num_collision_volumes="25">
+<linden_skeleton version="1.0" num_bones="51" num_collision_volumes="24">
<bone name="mPelvis" pos="0.000 0.000 1.067" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 1.067015">
<collision_volume name="PELVIS" pos = "-0.01 0 -0.02" rot="0.000000 8.00000 0.000000" scale="0.12 0.16 0.17"/>
<collision_volume name="BUTT" pos = "-0.06 0 -0.1" rot="0.000000 0.00000 0.000000" scale="0.1 0.1 0.1"/>
<bone name="mTorso" pos="0.000 0.000 0.084" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.084073">
<collision_volume name="BELLY" pos = "0.04 0 0.028" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/>
- <collision_volume name="STOMACH" pos = "0.088 0 0.092" rot="0.000000 0.00000 0.000000" scale="0.09 0.13 0.15"/>
- <collision_volume name="LEFT_HANDLE" pos = "0.056 0.125 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
- <collision_volume name="RIGHT_HANDLE" pos = "0.056 -0.125 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
+ <collision_volume name="LEFT_HANDLE" pos = "0.0 0.10 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
+ <collision_volume name="RIGHT_HANDLE" pos = "0.0 -0.10 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>
<bone name="mChest" pos="-0.015 0.000 0.205" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.015368 0.000000 0.204877">
<collision_volume name="CHEST" pos = "0.028 0 0.07" rot="0.000000 -10.00000 0.000000" scale="0.11 0.15 0.2"/>
<collision_volume name="LEFT_PEC" pos = "0.119 0.082 0.042" rot="0.000000 4.29000 0.000000" scale="0.05 0.05 0.05"/>