SL-276, SL-344 - skeleton and slider updates.

2 files changed, 30 insertions, 31 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 5802b6e2fd..59ae73bf49 100755
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -871,7 +871,7 @@
         <bone
          name="mPelvis"
          scale="0 0 0.3" />
-      </param_skeleton>
+        </param_skeleton>
     </param>
 
     <param
@@ -1079,22 +1079,22 @@
          offset="0 0 .004" />
 
 		 <bone
-         name="mFaceCheekUpperInnerLeft"
+         name="mFaceCheekLowerLeft"
          scale="0 0 0"
          offset="0 0 .004" />
 
 		 <bone
-         name="mFaceCheekUpperInnerRight"
+         name="mFaceCheekLowerRight"
          scale="0 0 0"
          offset="0 0 -.004" />
 		 
 		 <bone
-         name="mFaceCheekUpperOuterLeft"
+         name="mFaceCheekUpperLeft"
          scale="0 0 0"
          offset="0 0 .004" />
 
 		 <bone
-         name="mFaceCheekUpperOuterRight"
+         name="mFaceCheekUpperRight"
          scale="0 0 0"
          offset="0 0 -.004" />
 		 
@@ -1261,11 +1261,11 @@
          scale="0 0 0"
          offset="-0.0015 0 0" />
 		 <bone
-         name="mFaceCheekUpperInnerLeft"
+         name="mFaceCheekLowerLeft"
          scale="0 0 0"
          offset="-0.005 0 0" />
 		 <bone
-         name="mFaceCheekUpperInnerRight"
+         name="mFaceCheekLowerRight"
          scale="0 0 0"
          offset="-0.005 0 0" />
 		 
@@ -1485,22 +1485,22 @@
          offset="0 0 0" />
 
         <bone
-         name="mFaceCheekUpperInnerLeft"
+         name="mFaceCheekLowerLeft"
          scale="1 1 1"
          offset="0 0 0" />
 
         <bone
-         name="mFaceCheekUpperOuterLeft"
+         name="mFaceCheekUpperLeft"
          scale="1 1 1"
          offset="0 0 0" />
 
         <bone
-         name="mFaceCheekUpperInnerRight"
+         name="mFaceCheekLowerRight"
          scale="1 1 1"
          offset="0 0 0" />
 
         <bone
-         name="mFaceCheekUpperOuterRight"
+         name="mFaceCheekUpperRight"
          scale="1 1 1"
          offset="0 0 0" />
 
@@ -1859,10 +1859,10 @@
         <bone
          name   = "mFaceNoseRight"
 		 offset = "0 -0.0025 0" />		 
-		<!--bone
+		<bone
          name   = "mFaceNoseBridge"
 		 offset = "0.006 0.0 0.0"
-         scale  = "0.10 0.1 0.0" /-->
+         scale  = "0.10 0.1 0.0" />
 
       </param_skeleton>
     </param>
@@ -1988,10 +1988,10 @@
 		 scale  = "0.0 0.00 0.0"
 		 offset = "0.0 0.001 0.0" />
 		 
-        <!--bone
+        <bone
          name   = "mFaceNoseBridge"
 		 scale  = "0.0 0.00 0.0"
-		 offset = "0.0 0.007 0.0" /-->
+		 offset = "0.0 0.007 0.0" />
 
       </param_skeleton>
     </param>
@@ -2953,10 +2953,10 @@
      value_max="1.5">
       <param_skeleton>
 
-		 <!--bone
+		 <bone
          name="mFaceNoseBridge"
          scale="0.15 0.01 0.7"
-         offset="0.009 0 -0.006" /-->
+         offset="0.009 0 -0.006" />
 
 		 <bone
          name="mFaceForeheadCenter"
@@ -2974,10 +2974,10 @@
      value_max="1.5">
       <param_skeleton>
 
-		 <!--bone
+		 <bone
          name="mFaceNoseBridge"
          scale="0 0 0.2"
-         offset="0.00 0 0.002" /-->
+         offset="0.00 0 0.002" />
 
 		 <bone
          name="mFaceNoseCenter"
@@ -2995,10 +2995,10 @@
      value_max="1.2">
       <param_skeleton>
 
-		 <!--bone
+		 <bone
          name="mFaceNoseBridge"
          scale="0 0.4 0"
-         offset="0 0 0" /-->
+         offset="0 0 0" />
 
        </param_skeleton>
     </param>
@@ -3012,12 +3012,12 @@
       <param_skeleton>
 
 		 <bone
-         name="mFaceCheekUpperInnerLeft"
+         name="mFaceCheekLowerLeft"
          scale="0 0.1 0"
          offset="0.001 -0.01 0" />
 
 		 <bone
-         name="mFaceCheekUpperInnerRight"
+         name="mFaceCheekLowerRight"
          scale="0 0.1 0"
          offset="0.001 0.01 0" />
 
@@ -3033,12 +3033,12 @@
       <param_skeleton>
 
 		 <bone
-         name="mFaceCheekUpperOuterLeft"
+         name="mFaceCheekUpperLeft"
          scale="0.15 0.1 0.1"
          offset="0.002 0 0.002" />
 
 		 <bone
-         name="mFaceCheekUpperOuterRight"
+         name="mFaceCheekUpperRight"
          scale="0.15 0.1 0.1"
          offset="0.002 0 0.002" />
 
@@ -3054,12 +3054,12 @@
       <param_skeleton>
 
 		 <bone
-         name="mFaceCheekUpperOuterLeft"
+         name="mFaceCheekUpperLeft"
          scale="0 0 0"
          offset="0 0 0.02" />
 
 		 <bone
-         name="mFaceCheekUpperOuterRight"
+         name="mFaceCheekUpperRight"
          scale="0 0 0"
          offset="0 0 0.02" />
 
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
index a9c1331935..62cb782bf1 100755
--- a/indra/newview/character/avatar_skeleton.xml
+++ b/indra/newview/character/avatar_skeleton.xml
@@ -23,7 +23,7 @@
                               <bone aliases="figureHair avatar_mSkull" connected="false" end="0.000 0.000 0.033" group="Extra" name="mSkull" pivot="0.000000 0.000000 0.079000" pos="0.000 0.000 0.079" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" support="base"/>
                               <bone aliases="avatar_mEyeRight" connected="false" end="0.100 0.000 0.000" group="Extra" name="mEyeRight" pivot="0.098466 -0.036000 0.079000" pos="0.098 -0.036 0.079" rot="0.000000 0.000000 -0.000000" scale="1.000 1.000 1.000" support="base"/>
                               <bone aliases="avatar_mEyeLeft" connected="false" end="0.100 0.000 0.000" group="Extra" name="mEyeLeft" pivot="0.098461 0.036000 0.079000" pos="0.098 0.036 0.079" rot="0.000000 -0.000000 0.000000" scale="1.000 1.000 1.000" support="base"/>
-                              <bone connected="false" end="0.020 0.000 0.000" group="Face" name="mFaceRoot" pivot="0.025 0.000 0.045" pos="0.025 0.000 0.045" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended">
+                              <bone connected="false" end="0.020 0.000 0.000" group="Face" name="mFaceRoot" pivot="0.025006 0.000000 0.045011" pos="0.025006 0.000000 0.045011" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended">
                                  <bone connected="false" end="0.024 0.004 0.018" group="Face" name="mFaceForeheadLeft" pivot="0.061 0.035 0.083" pos="0.061 0.035 0.083" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.024 -0.004 0.018" group="Face" name="mFaceForeheadRight" pivot="0.061 -0.035 0.083" pos="0.061 -0.035 0.083" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.023 0.013 0.000" group="Eyes" name="mFaceEyebrowOuterLeft" pivot="0.064 0.051 0.048" pos="0.064 0.051 0.048" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
@@ -33,10 +33,10 @@
                                  <bone connected="false" end="0.027 0.000 0.000" group="Eyes" name="mFaceEyebrowCenterRight" pivot="0.070 -0.043 0.056" pos="0.070 -0.043 0.056" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.026 0.000 0.000" group="Eyes" name="mFaceEyebrowInnerRight" pivot="0.075 -0.022 0.051" pos="0.075 -0.022 0.051" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.038 0.000 0.000" group="Eyes" name="mFaceEyeLidUpperLeft" pivot="0.062 0.036 0.039" pos="0.062 0.036 0.039" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
-                                 <bone connected="false" end="0.100 0.000 0.000" group="Face" name="mFaceEyeAltLeft" pivot="0.073497 0.036018 0.034017" pos="0.073 0.036 0.034" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended"/>
+                                 <bone connected="false" end="0.100 0.000 0.000" group="Face" name="mFaceEyeAltLeft" pivot="0.073515 0.036027 0.034026" pos="0.070515 0.036027 0.034026" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.036 0.000 0.000" group="Eyes" name="mFaceEyeLidLowerLeft" pivot="0.061 0.036 0.027" pos="0.061 0.036 0.027" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.038 0.000 0.000" group="Eyes" name="mFaceEyeLidUpperRight" pivot="0.062 -0.036 0.039" pos="0.062 -0.036 0.039" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
-                                 <bone connected="false" end="0.100 0.000 0.000" group="Face" name="mFaceEyeAltRight" pivot="0.073502 -0.036018 0.034017" pos="0.074 -0.036 0.034" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended"/>
+                                 <bone connected="false" end="0.100 0.000 0.000" group="Face" name="mFaceEyeAltRight" pivot="0.073520 -0.036027 0.034026" pos="0.070520 -0.036027 0.034026" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="0.036 0.000 0.000" group="Eyes" name="mFaceEyeLidLowerRight" pivot="0.061 -0.036 0.027" pos="0.061 -0.036 0.027" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
                                  <bone connected="false" end="-0.019 0.018 0.025" group="Ears" name="mFaceEar1Left" pivot="0.000 0.080 0.002" pos="0.000 0.080 0.002" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended">
                                     <bone connected="true" end="0.000 0.000 0.033" group="Ears" name="mFaceEar2Left" pivot="-0.019 0.018 0.025" pos="-0.019 0.018 0.025" rot="0.000 0.000 0.000" scale="1.00 1.00 1.00" support="extended"/>
@@ -222,4 +222,3 @@
       </bone>
    </bone>
 </linden_skeleton>
-