Merge with viewer-2.0.0-3 branch

3 files changed, 140 insertions, 73 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index f484167cab..c943c57fdb 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -5542,6 +5542,14 @@
       <texture
        local_texture="hair_grain" />
     </layer>
+
+    <layer
+       name="hair alpha"
+       visibility_mask="TRUE">
+      <texture
+         local_texture="hair_alpha" />
+    </layer>
+
   </layer_set>
   <!-- =========================================================== -->
 
@@ -5615,13 +5623,31 @@
          </param>
       </layer>
 
-	  <layer
-       name="head_bodypaint">
-         <texture
-          local_texture="head_bodypaint" />
-      </layer>
+      <layer
+       name="highlight">
+                  <texture
+                    tga_file="head_highlights_alpha.tga"
+          file_is_mask="TRUE" />
 
-	  <layer
+
+         <param
+                    id="159"
+                    group="1"
+                    name="Shading"
+                    wearable="skin"
+                    value_min="0"
+          value_max="1">
+                        <param_color>
+                              <value
+                color="255, 255, 255, 0" />
+
+
+               <value
+                color="255, 255, 255, 64" />
+                        </param_color>
+                  </param>
+            </layer>	  
+      <layer
        name="rosyface">
          <texture
           tga_file="rosyface_alpha.tga"
@@ -5651,52 +5677,6 @@
       </layer>
 
 	  <layer
-       name="freckles"
-       fixed_color="120,47,20,128">
-         <param
-          id="165"
-          group="0"
-          wearable="skin"
-          edit_group="skin_facedetail"
-          edit_group_order="2"
-          name="Freckles"
-          label_min="Less"
-          label_max="More"
-          value_min="0"
-          value_max="1"
-          camera_distance=".3"
-          camera_elevation=".07">
-            <param_alpha
-             tga_file="freckles_alpha.tga"
-             skip_if_zero="true"
-             domain="0.5" />
-         </param>
-      </layer>
-
-      <layer
-       name="highlight">
-         <texture
-          tga_file="head_highlights_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="159"
-          group="1"
-          name="Shading"
-          wearable="skin"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 64" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
        name="lips">
          <texture
           tga_file="lips_mask.tga"
@@ -5757,8 +5737,29 @@
              domain="0.3" />
          </param>
       </layer>-->
-
       <layer
+              name="freckles"
+       fixed_color="120,47,20,128">
+                  <param
+                    id="165"
+                    group="0"
+                    wearable="skin"
+                    edit_group="skin_facedetail"
+                    edit_group_order="2"
+                    name="Freckles"
+                    label_min="Less"
+                    label_max="More"
+                    value_min="0"
+                    value_max="1"
+                    camera_distance=".3"
+          camera_elevation=".07">
+                        <param_alpha
+                          tga_file="freckles_alpha.tga"
+                          skip_if_zero="true"
+             domain="0.5" />
+                  </param>
+            </layer>
+            <layer
        name="eyebrowsbump"
        render_pass="bump">
          <texture
@@ -6458,8 +6459,6 @@
       <layer
        name="facialhair"
        global_color="hair_color">
-         <morph_mask
-          morph_name="Displace_Hair_Facial" />
 
          <texture
           tga_file="head_hair.tga"
@@ -6546,6 +6545,23 @@
          </param>
       </layer>
 
+   <layer
+       name="head_bodypaint">
+         <texture
+          local_texture="head_bodypaint" />
+      </layer>
+   <layer
+      name="head alpha"
+      visibility_mask="TRUE">
+     <texture
+        local_texture="head_alpha" />
+   </layer>
+   <layer
+      name="head_tattoo">
+     <texture
+        local_texture="head_tattoo" />
+   </layer>
+
    </layer_set>
 
 <!-- =========================================================== -->
@@ -6662,6 +6678,13 @@
       </layer>
 
       <layer
+       name="upper_tattoo">
+        <texture
+           local_texture="upper_tattoo" />
+      </layer>
+
+
+      <layer
        name="upper_undershirt bump"
        render_pass="bump"
        fixed_color="128,128,128,255">
@@ -7289,12 +7312,6 @@
          <texture
           local_texture="upper_shirt" />
 
-         <morph_mask
-          morph_name="Displace_Loose_Upperbody" />
-
-         <morph_mask
-          morph_name="Shirtsleeve_flair" />
-
          <param
           id="803"
           group="0"
@@ -7730,6 +7747,14 @@
              domain="0.01" />
          </param>
       </layer>
+
+      <layer
+       name="upper alpha"
+       visibility_mask="TRUE">
+       <texture
+        local_texture="upper_alpha" />
+     </layer>
+
    </layer_set>
 
 <!-- =========================================================== -->
@@ -7846,6 +7871,12 @@
       </layer>
 
       <layer
+       name="lower_tattoo">
+         <texture
+          local_texture="lower_tattoo" />
+      </layer>
+
+      <layer
        name="lower_underpants bump"
        render_pass="bump"
        fixed_color="128,128,128,255">
@@ -8315,18 +8346,6 @@
          <texture
           local_texture="lower_pants" />
 
-         <morph_mask
-          morph_name="Displace_Loose_Lowerbody" />
-
-         <morph_mask
-          morph_name="Leg_Pantflair" />
-
-         <morph_mask
-          morph_name="Low_Crotch" />
-
-         <morph_mask
-          morph_name="Leg_Longcuffs" />
-
          <param
           id="806"
           group="0"
@@ -8602,6 +8621,14 @@
              domain="0.01" />
          </param>
       </layer>
+
+      <layer
+         name="lower alpha"
+         visibility_mask="TRUE">
+        <texture
+           local_texture="lower_alpha" />
+      </layer>
+
    </layer_set>
 
 <!-- =========================================================== -->
@@ -8621,6 +8648,14 @@
          <texture
           local_texture="eyes_iris" />
       </layer>
+
+     <layer
+        name="eyes alpha"
+        visibility_mask="TRUE">
+       <texture
+          local_texture="eyes_alpha" />
+     </layer>
+
    </layer_set>
 
 <!-- =========================================================== -->
@@ -8800,6 +8835,7 @@
              domain="0" />
          </param>
       </layer>
+
    </layer_set>
 
 <!-- =========================================================== -->
@@ -11260,5 +11296,36 @@
       </param>
       
    </driver_parameters>
+
+  <morph_masks>
+    <mask
+     morph_name="Displace_Hair_Facial"
+     body_region="head"
+     layer="facialhair" />
+    <mask
+     morph_name="Displace_Loose_Upperbody"
+     body_region="upper_body"
+     layer="upper_clothes" />
+    <mask
+     morph_name="Shirtsleeve_flair"
+     body_region="upper_body"
+     layer="upper_clothes" />
+    <mask
+     morph_name="Displace_Loose_Lowerbody"
+     body_region="lower_body"
+     layer="lower_pants" />
+    <mask
+     morph_name="Leg_Pantflair"
+     body_region="lower_body"
+     layer="lower_pants" />
+    <mask
+     morph_name="Low_Crotch"
+     body_region="lower_body"
+     layer="lower_pants" />
+    <mask
+     morph_name="Leg_Longcuffs"
+     body_region="lower_body"
+     layer="lower_pants" />
+  </morph_masks>
 </linden_avatar>
 
diff --git a/indra/newview/character/checkerboard.tga b/indra/newview/character/checkerboard.tga
new file mode 100644
index 0000000000..1950d7403d
--- /dev/null
+++ b/indra/newview/character/checkerboard.tga
diff --git a/indra/newview/character/invisible_head.tga b/indra/newview/character/invisible_head.tga
new file mode 100755
index 0000000000..2673a237d5
--- /dev/null
+++ b/indra/newview/character/invisible_head.tga