Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloatermessagelog.cpp
	indra/newview/llstartup.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/menu_inventory.xml
This commit is contained in:
Siana Gearz
2012-03-28 22:27:45 +02:00
parent be9f3178c0 3d6511f4e1
commit f05edda4f4
264 changed files with 27606 additions and 15368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
indra/newview/character/avatar_lad.xml
View File

@@ -6387,8 +6387,6 @@
<layer
name="facialhair"
global_color="hair_color">
<morph_mask
morph_name="Displace_Hair_Facial" />
<texture
tga_file="head_hair.tga"
@@ -7294,12 +7292,6 @@
<texture
local_texture="upper_shirt" />
<morph_mask
morph_name="Displace_Loose_Upperbody" />
<morph_mask
morph_name="Shirtsleeve_flair" />
<param
id="803"
group="0"
@@ -8360,18 +8352,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"
@@ -11863,6 +11843,37 @@
value_max="1">
<param_driver />
</param>
</driver_parameters>
</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>