From 30d17f3fd5a08936904d4123f802f6a0ee415009 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 22 Jun 2016 19:11:38 -0400 Subject: SL-117, SL-344 - additional proposed updates for skeleton, sliders --- indra/newview/character/avatar_lad.xml | 1281 +++++++++++++++------------ indra/newview/character/avatar_skeleton.xml | 6 +- 2 files changed, 739 insertions(+), 548 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 7f9dc73ddd..8b4d503eb1 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,6 +1,6 @@ + version="2.0" wearable_definition_version="22"> - + - + - + - - + + - + @@ -880,7 +880,7 @@ - + @@ -971,7 +971,7 @@ scale="0.0 0.0 0.0" offset="0 -0.02 0" /> - @@ -1163,7 +1163,7 @@ name="mEyeRight" scale="0 0 0" offset="0 -.009 0" /> - + - + + offset="0 .00930 0" /> - + offset="0 -.00930 0" /> + + offset="0 .00930 0" /> - + offset="0 -.00930 0" /> + + offset="0 .00930 0" /> - + offset="0 -.00930 0" /> + + offset="0 .00930 0" /> - + offset="0 -.00930 0" /> + - + - + @@ -1257,7 +1257,7 @@ name="mEyeRight" scale="0 0 0" offset="0 0 -.004" /> - + + offset="0 0 -.004" /> - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1440,6 +1440,26 @@ name="mFaceEyeAltRight" scale="0 0 0" offset=".016 0 0" /> + + + + + + + + - - - - - + offset="0.02 0 0" /> - + offset="0.02 0 0" /> - + + - - - - - - @@ -1527,9 +1547,19 @@ offset="0.012 0 0" /> + offset="0.014 0 0" /> + + + + @@ -1623,10 +1653,10 @@ name="mFaceEyebrowOuterLeft" scale="0 0 0 " offset=".0013 0 0" /> + + - - - + @@ -1648,27 +1678,27 @@ name = "mFaceTeethLower" scale = "1 1 1" offset = "0 0 0" /> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + - + - + + scale="0 0 0" + offset="-.005 0.0 -0.0" /> - + scale="0 0 0" + offset="-.005 0.0 -0.0" /> + + scale="0 0 0" + offset="-.005 0.0 -0.0" /> - + scale="0 0 0" + offset="-.005 0.0 -0.0" /> + - + - + @@ -2183,7 +2223,7 @@ scale="0 0 .5" /> - + - + - + - + - + @@ -2285,11 +2325,11 @@ + offset = "0.001 0.010 0"/> + offset = "-0.001 -0.01 0" /> @@ -2302,44 +2342,44 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -2982,14 +3022,14 @@ - + + offset = "0.0 0.005 0.0" /> - + - + - + @@ -3063,15 +3103,15 @@ - + - + - + + - - - - - - - - - + - - - - - - - - - - + + + + - + - + - - + + + + + name = "mFaceChin" + offset = "0.01 0.00 0" + scale = "0.0 0.0 0.0" /> + + + + + + + - + - + - + - + - + - + - + - + scale = "0.0 0.5 0.0" /> + - - + + + offset="0 0 .0035" /> - + offset="0 0 .0035" /> + + offset="0 0 -.0035" /> + offset="0 0 -.0035" /> - + - + - + - + - + + offset="0 0 0" /> + offset="0 0 0" /> - + - + - + - + - + - + - + - + - + - + - + - + - + + offset="0 0 0.005" /> - + offset="0 -0.00225 0.0075" /> + - + - + - + - + - + - + + offset="0 0 0.005" /> + offset="0 0.000 0.005" /> - + - - - + scale="0 -0.07 0.07" + offset="0 0 0.005" /> + - + - + - - + + - + - + - + - + - + - + - + - + - + offset="0 -0.00225 0.0075" /> + - + - + - + - + - + - + - + - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + @@ -4054,7 +4071,7 @@ name="mFaceJaw" scale="0.0 0.5 0.0" offset="0.0 0.0 0.0" /> - + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - + + name="mFaceEyecornerInnerLeft" + scale="0 0 0" + offset="0 0.0017 0.0025" /> + name="mFaceEyebrowOuterLeft" + scale="0 0 0" + offset="0 0.004 0.0014" /> - - + - - + + name="mFaceLipUpperLeft" + scale="0 0 0" + offset="0 0.0014 0.007" /> + name="mFaceLipLowerCenter" + scale="0 0 0" + offset="0 0 0.0055" /> + name="mFaceTeethLower" + scale="0 0 0" + offset="0 0 0.006" /> + name="mFaceLipLowerLeft" + scale="0 0 0" + offset="0 0.00225 0.0055" /> - - + - - + + name="mFaceCheekLowerRight" + scale="0 0 0" + offset="0 0 0.0085" /> - - + - - + - + - + - + - + - + - - + + + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + cross_wearable="true" + value_min="0" + value_max="1"> @@ -8754,7 +8964,7 @@ - + - + - + id="30004" /> - + - - + + id="30656" /> - + id="30506" /> - + id="30764" /> - + - + id="30035" /> - + id="30015" /> - + id="30796" /> - + id="30185" /> - + id="30760" /> - - + + id="30665" /> - + id="20006" /> - + - + id="20007" /> - + id="20008" /> - + - - + + id="30650" /> - + id="30880" /> - + id="30765" /> - + id="30001" /> - + id="30758" /> - + id="30027" /> - + id="30759" /> - + id="30010" /> - + id="30017" /> - + id="30018" /> - + id="30014" /> - + max1="1" max2="1" min2="1" /> - + max1="1" max2="1" min2="1" /> - + max1="1" max2="1" min2="1" /> - + @@ -13542,7 +13752,7 @@ render_pass="bump"> - + @@ -14232,7 +14442,7 @@ render_pass="bump"> max1="1" max2="1" min2="1" /> - + max1="1" max2="1" min2="1" /> - + @@ -14273,28 +14483,9 @@ render_pass="bump"> - + - - - - - - - - - - + id="30646" /> @@ -14322,7 +14513,7 @@ render_pass="bump"> - + @@ -15579,7 +15770,7 @@ render_pass="bump"> id="872" /> - + - + - + max1="1" max2="1" min2="1" /> - + - + @@ -63,11 +63,11 @@ + - @@ -220,7 +220,7 @@ - + -- cgit v1.2.3