SL-242 - more tweaks around alt eyes and wings. Alt eyes are now parented to face root, and alt eyes animate along with the original eyes inside the LLHeadRotMotion code.

2 files changed, 303 insertions, 157 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 76a603db06..e9ce4725e5 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -807,6 +807,39 @@
         <bone
          name="mHindLimb2Right"
          scale="0 0 0.1" />
+		 
+        <bone
+         name="mWing1Left"
+         offset="0 0 0" /> 
+        <bone
+         name="mWing2Left"
+         offset="-0.015 0.015 0" /> 
+        <bone
+         name="mWing3Left"
+         offset="-0.025 0.025 0" /> 
+        <bone
+         name="mWing4Left"
+         offset="-0.03 0.03 0" /> 
+        <bone
+         name="mWing4FanLeft"
+         offset="-0.03 0.03 0" /> 
+		 
+        <bone
+         name="mWing1Right"
+         offset="0 0 0" /> 
+        <bone
+         name="mWing2Right"
+         offset="-0.015 -0.015 0" /> 
+        <bone
+         name="mWing3Right"
+         offset="-0.025 -0.025 0" /> 
+        <bone
+         name="mWing4Right"
+         offset="-0.03 -0.03 0" /> 
+        <bone
+         name="mWing4FanRight"
+         offset="-0.03 -0.03 0" /> 
+		 
       </param_skeleton>
     </param>
 
@@ -1163,56 +1196,57 @@
          name="mEyeRight"
          scale="0 0 0"
          offset="0 -.009 0" />
-		 
-	    <bone
+
+		 <bone
          name="mFaceEyeAltLeft"
          scale="0 0 0 "
-         offset="0 .009 0" />
+         offset="0 .0090 0" />
 
         <bone
          name="mFaceEyeAltRight"
          scale="0 0 0 "
-         offset="0 -.009 0" />
-		 
+         offset="0 -.0090 0" />
+ 
 	    <bone
          name="mFaceEyeLidLowerLeft"
          scale="0 0 0 "
-         offset="0 .00930 0" />
+         offset="0 .0090 0" />
 
         <bone
          name="mFaceEyeLidLowerRight"
          scale="0 0 0 "
-         offset="0 -.00930 0" />
+         offset="0 -.0090 0" />
+
 		 
 	    <bone
          name="mFaceEyeLidUpperLeft"
          scale="0 0 0 "
-         offset="0 .00930 0" />
+         offset="0 .0090 0" />
 
         <bone
          name="mFaceEyeLidUpperRight"
          scale="0 0 0 "
-         offset="0 -.00930 0" />
+         offset="0 -.0090 0" />
 		 
 	    <bone
          name="mFaceEyebrowInnerLeft"
          scale="0 0 0 "
-         offset="0 .00930 0" />
+         offset="0 .0090 0" />
 
         <bone
          name="mFaceEyebrowInnerRight"
          scale="0 0 0 "
-         offset="0 -.00930 0" />
+         offset="0 -.0090 0" />
 		 
 	    <bone
          name="mFaceEyebrowCenterLeft"
          scale="0 0 0 "
-         offset="0 .00930 0" />
+         offset="0 .0090 0" />
 
         <bone
          name="mFaceEyebrowCenterRight"
          scale="0 0 0 "
-         offset="0 -.00930 0" />
+         offset="0 -.0090 0" />
 		 
 	    <bone
          name="mFaceEyebrowOuterLeft"
@@ -1257,16 +1291,16 @@
          name="mEyeRight"
          scale="0 0 0"
          offset="0 0 -.004" />
-		 
-        <bone
+
+		 <bone
          name="mFaceEyeAltLeft"
          scale="0 0 0"
          offset="0 0 .004" />
 
-        <bone
+		 <bone
          name="mFaceEyeAltRight"
          scale="0 0 0"
-         offset="0 0 -.004" /> 
+         offset="0 0 -.004" />
 
 		<bone
          name="mFaceNoseRight"
@@ -1421,11 +1455,6 @@
      value_min="-1"
      value_max="1">
       <param_skeleton>
-		<bone
-         name="mFaceRoot"
-         scale="0.25 0 0"
-         offset="0 0 0" />
-		 
         <bone
          name="mEyeLeft"
          scale="0 0 0"
@@ -1436,131 +1465,6 @@
          scale="0 0 0"
          offset=".016 0 0" />
 
-        <bone
-         name="mFaceEyeAltLeft"
-         scale="0 0 0"
-         offset=".016 0 0" />
-
-        <bone
-         name="mFaceEyeAltRight"
-         scale="0 0 0"
-         offset=".016 0 0" />
-		 
-		 <bone
-         name="mFaceEyeLidUpperLeft"
-         scale="0 0 0"
-         offset="-0.0038 0 0" />
-
-		 <bone
-         name="mFaceEyeLidUpperRight"
-         scale="0 0 0"
-         offset="-0.0038 0 0" />
-		 
-		 <bone
-         name="mFaceEyeLidLowerLeft"
-         scale="0 0 0"
-         offset="-0.0038 0 0" />
-
-		 <bone
-         name="mFaceEyeLidLowerRight"
-         scale="0 0 0"
-         offset="-0.0038 0 0" />
-
-		<bone
-         name="mFaceNoseCenter"
-         scale="0 0 0"
-         offset=".01 0 0" />
-
-		<bone
-         name="mFaceNoseRight"
-         scale="0 0 0"
-         offset=".005 0 0" />
-
-		<bone
-         name="mFaceNoseLeft"
-         scale="0 0 0"
-         offset=".005 0 0" />
-
-		<bone
-         name="mFaceNoseBase"
-         scale="0 0 0"
-         offset=".005 0 0" />
-
-		<bone
-         name="mFaceLipUpperLeft"
-         scale="0 0 0"
-         offset="0.005 0 0" />
-
-		<bone
-         name="mFaceLipUpperCenter"
-         scale="0 0 0"
-         offset="0.005 0 0" />
-
-		<bone
-         name="mFaceLipUpperRight"
-         scale="0 0 0"
-         offset="0.005 0 0" />
-		 
-		<bone
-         name="mFaceLipCornerRight"
-         scale="0 0 0"
-         offset="0.005 0 0" />
-
-		<bone
-         name="mFaceLipCornerLeft"
-         scale="0 0 0"
-         offset="0.005 0 0" />
-
-		<bone
-         name="mFaceLipLowerLeft"
-         scale="0 0 0"
-         offset="0.01 0 0" />
-
-		<bone
-         name="mFaceLipLowerCenter"
-         scale="0 0 0"
-         offset="0.01 0 0" />
-
-		<bone
-         name="mFaceLipLowerRight"
-         scale="0 0 0"
-         offset="0.01 0 0" />
-		 
-		 
-		<bone
-         name="mFaceCheekLowerLeft"
-         scale="0 0 0"
-         offset="0.007 0 0" />
-		 
-		<bone
-         name="mFaceCheekLowerRight"
-         scale="0 0 0"
-         offset="0.007 0 0" />
-
-		 <bone
-         name="mFaceChin"
-         scale="0 0 0"
-         offset="0.014 0 0" />
-
- 	    <bone
-         name="mFaceTeethUpper"
-         scale="0.28 0 0"
-         offset="0 0 0" />
- 	    <bone
-         name="mFaceTeethLower"
-         scale="0.28 0 0"
-         offset="0 0 0" />
-		 
-		 <bone
-         name="mFaceTongueBase"
-         scale="0.3 0 0"
-         offset="0 0 0" />
-
-		 <bone
-         name="mFaceTongueTip"
-         scale="0 0 0"
-         offset="0.004 0 0" />
-
       </param_skeleton>
     </param>
 	
@@ -1584,6 +1488,7 @@
          name="mEyeRight"
          scale="0 0 0"
          offset=".005 0 0" />
+		 
         <bone
          name="mFaceEyeAltLeft"
          scale="0 0 0"
@@ -1593,7 +1498,7 @@
          name="mFaceEyeAltRight"
          scale="0 0 0"
          offset=".005 0 0" />
-
+		 
 	    <bone
          name="mFaceEyeLidLowerLeft"
          scale="0 0 0 "
@@ -1727,17 +1632,17 @@
          name="mEyeRight"
          scale="1 1 1"
          offset="0 0 0" />
- 
+		 
         <bone
          name="mFaceEyeAltLeft"
          scale="1 1 1"
-         offset="0 0 0" />
+         offset="0 0 -0.001" />
 
         <bone
          name="mFaceEyeAltRight"
          scale="1 1 1"
-         offset="0 0 0" />
- 
+         offset="0 0 -0.001" />
+		 
         <bone
          name="mFaceForeheadLeft"
          scale="1 1 1"
@@ -2087,6 +1992,16 @@
          offset=" 0 0 0" />
 		 
         <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="0 0 0" />
+
+        <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="0 0 0" />
+
+		 <bone
          name="mFaceEyeLidUpperRight"
          scale="0 0.3 0.7"
          offset=" 0 0 0" />
@@ -3173,6 +3088,16 @@
          name="mFaceEyeLidUpperLeft"
          scale="0 0.1 0.2"
          offset=" 0 0 0" />
+		 
+        <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="0 0 0" />
+
+        <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="0 0 0" />
 
        </param_skeleton>
     </param>
@@ -3351,6 +3276,16 @@
          name="mFaceEyebrowInnerLeft"
          scale="0 0 0"
          offset="0 0.00225 -0.0048" />
+		 
+		 <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="0 -0.0042 -0.0035" />		 
+
+		 <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="0 0.0042 -0.0035" />		 
 
 		 <bone
          name="mFaceEyeLidUpperRight"
@@ -3756,6 +3691,16 @@
          scale="0 0 0"
          offset="0 0 -.006" />
 
+		 <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="0 0 -.006" />
+
+		 <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="0 0 -.006" />
+
        </param_skeleton>
     </param>
 
@@ -3929,6 +3874,16 @@
 		 offset = "0.015  0.00  0.005"
          scale  = "0.0 0.0 0.0" />
 
+		 <bone
+		  name="mFaceEyeAltRight"
+		  scale="0 0 0"
+		  offset="0 -0.0033 0.0025" />
+
+		 <bone
+		  name="mFaceEyeAltLeft"
+		  scale="0 0 0"
+		  offset="0 0.0033 0.0025" />
+		 
 		<bone
 		 name="mFaceEyeLidLowerRight"
 		 scale="0 0 0"
@@ -4098,9 +4053,183 @@
          name="mFaceEyeAltRight"
          scale="0.3195 0.3280 0.3280"
          offset="-0.005 0 0" />
+
+      </param_skeleton>
+    </param>
+
+    <param
+     id="30772"
+     group="1"
+     name="EyeBone_Head_Elongate"
+     value_min="-1"
+     value_max="1">
+      <param_skeleton>
+	  
+		<bone
+         name="mFaceRoot"
+         scale="0.25 0 0"
+         offset="0 0 0" />
+
+		<bone
+         name="mFaceEyeLidUpperLeft"
+         scale="0 0 0"
+         offset="-0.0038 0 0" />
+
+		 <bone
+         name="mFaceEyeLidUpperRight"
+         scale="0 0 0"
+         offset="-0.0038 0 0" />
 		 
+		 <bone
+         name="mFaceEyeLidLowerLeft"
+         scale="0 0 0"
+         offset="-0.0038 0 0" />
+
+		 <bone
+         name="mFaceEyeLidLowerRight"
+         scale="0 0 0"
+         offset="-0.0038 0 0" />
+
+		<bone
+         name="mFaceNoseCenter"
+         scale="0 0 0"
+         offset=".01 0 0" />
+
+		<bone
+         name="mFaceNoseRight"
+         scale="0 0 0"
+         offset=".005 0 0" />
+
+		<bone
+         name="mFaceNoseLeft"
+         scale="0 0 0"
+         offset=".005 0 0" />
+
+		<bone
+         name="mFaceNoseBase"
+         scale="0 0 0"
+         offset=".005 0 0" />
+
+		<bone
+         name="mFaceLipUpperLeft"
+         scale="0 0 0"
+         offset="0.005 0 0" />
+
+		<bone
+         name="mFaceLipUpperCenter"
+         scale="0 0 0"
+         offset="0.005 0 0" />
+
+		<bone
+         name="mFaceLipUpperRight"
+         scale="0 0 0"
+         offset="0.005 0 0" />
+		 
+		<bone
+         name="mFaceLipCornerRight"
+         scale="0 0 0"
+         offset="0.005 0 0" />
+
+		<bone
+         name="mFaceLipCornerLeft"
+         scale="0 0 0"
+         offset="0.005 0 0" />
+
+		<bone
+         name="mFaceLipLowerLeft"
+         scale="0 0 0"
+         offset="0.01 0 0" />
+
+		<bone
+         name="mFaceLipLowerCenter"
+         scale="0 0 0"
+         offset="0.01 0 0" />
+
+		<bone
+         name="mFaceLipLowerRight"
+         scale="0 0 0"
+         offset="0.01 0 0" />
+		 
+		 
+		<bone
+         name="mFaceCheekLowerLeft"
+         scale="0 0 0"
+         offset="0.007 0 0" />
+		 
+		<bone
+         name="mFaceCheekLowerRight"
+         scale="0 0 0"
+         offset="0.007 0 0" />
+
+		 <bone
+         name="mFaceChin"
+         scale="0 0 0"
+         offset="0.014 0 0" />
+
+ 	    <bone
+         name="mFaceTeethUpper"
+         scale="0.28 0 0"
+         offset="0 0 0" />
+ 	    <bone
+         name="mFaceTeethLower"
+         scale="0.28 0 0"
+         offset="0 0 0" />
+		 
+		 <bone
+         name="mFaceTongueBase"
+         scale="0.3 0 0"
+         offset="0 0 0" />
+
+		 <bone
+         name="mFaceTongueTip"
+         scale="0 0 0"
+         offset="0.004 0 0" />
+
       </param_skeleton>
     </param>
+	
+    <param
+     id="31772"
+     group="1"
+     name="EyeBone_Head_Elongate"
+     value_min="0"
+     value_max="1">
+      <param_skeleton>
+	  
+        <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="0.0058 0 0" />
+
+        <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="0.0058 0 0" />
+
+      </param_skeleton>
+    </param>		 
+	
+    <param
+     id="32772"
+     group="1"
+     name="EyeBone_Head_Elongate"
+     value_min="0"
+     value_max="1">
+      <param_skeleton>
+	  
+        <bone
+         name="mFaceEyeAltLeft"
+         scale="0 0 0"
+         offset="-0.0032 0 0" />
+
+        <bone
+         name="mFaceEyeAltRight"
+         scale="0 0 0"
+         offset="-0.0032 0 0" />
+
+      </param_skeleton>
+    </param>		 
+	
 
     <!-- Eye Brow sliders -->
 
@@ -14577,6 +14706,23 @@ render_pass="bump">
 
         <driven
          id="772" />
+		
+		<driven
+		 id="30772" />
+		 
+		<driven
+		 min1="0"
+		 max1="0"
+		 max2="0"
+		 min2="0.45"
+		 id="31772" />
+		 
+		<driven
+		 min1="0.5"
+		 max1="1"
+		 max2="1"
+		 min2="1"
+		 id="32772" />
 		 
       </param_driver>
     </param>
diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml
index 2c63b8092d..2241a12545 100644
--- a/indra/newview/character/avatar_skeleton.xml
+++ b/indra/newview/character/avatar_skeleton.xml
@@ -21,11 +21,11 @@
                            <bone aliases="head avatar_mHead" connected="true" end="0.000 0.000 0.079" group="Torso" name="mHead" pivot="0.000000 -0.000000 0.075630" pos="0.000 -0.000 0.076" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" support="base">
                               <collision_volume end="0.000 0.000 0.100" group="Collision" name="HEAD" pos="0.02 0 0.07" rot="0.000000 0.000000 0.000000" scale="0.11 0.09 0.12" support="base"/>
                               <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.022 0.000 0.000" group="Face" name="mFaceEyeAltRight" pivot="0.098466 -0.036000 0.079000" pos="0.098 -0.036 0.079" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended"/>
-                              <bone connected="false" end="0.022 0.000 0.000" group="Face" name="mFaceEyeAltLeft" pivot="0.098461 0.036000 0.079000" pos="0.098 0.036 0.079" rot="0.000000 0.000000 0.000000" 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.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 aliases="avatar_mEyeRight" connected="false" end="0.025 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.025 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.025000 0.000000 0.045000" pos="0.025 0.000 0.045" rot="0.000000 0.000000 0.000000" scale="1.00 1.00 1.00" support="extended">
+                                 <bone connected="false" end="0.025 0.000 0.000" group="Face" name="mFaceEyeAltRight" pivot="0.073466 -0.036000 0.0339300" 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.025 0.000 0.000" group="Face" name="mFaceEyeAltLeft" pivot="0.073461 0.036000 0.0339300" 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.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"/>