diff options
| -rwxr-xr-x | indra/newview/character/avatar_lad.xml | 148 | ||||
| -rwxr-xr-x | indra/newview/character/avatar_skeleton.xml | 10 | 
2 files changed, 144 insertions, 14 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index e5b385f4aa..b615d8d469 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3826,6 +3826,10 @@            name="BELLY"            scale="0.075 0.04 0.03"            pos="0.07 0 -0.07"/> +        <volume_morph +          name="STOMACH" +          scale="0.0272 0.0272 0.0272" +          pos="0.132 -0.016 0.0"/>        </param_morph>      </param> @@ -3844,7 +3848,16 @@       camera_elevation=".1"       camera_distance="1"       camera_angle="15"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0273 0.0273 0.0273" +          pos="0.038 0.024 -0.016"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0273 0.0273 0.0273" +          pos="0.038 -0.024 -0.016"/> +	  </param_morph>      </param>      <param @@ -3861,7 +3874,16 @@       value_max="1"       camera_elevation="0"       camera_distance=".28"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 -0.027 0.007"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.027 0.007"/> +	  </param_morph>      </param>      <param @@ -3878,7 +3900,16 @@       value_max="1"       camera_elevation="0"       camera_distance=".28"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 -0.035 0.009"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.035 0.009"/> +	  </param_morph>      </param>      <param @@ -4042,6 +4073,18 @@            scale="0.02 0.03 0.03"            pos="0 0 -0.03"/>          <volume_morph +          name="LEFT_PEC" +          scale="0.0367 0.0367 0.016" +          pos="0.031 -0.005 -0.013"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0367 0.0367 0.016" +          pos="0.031 0.005 -0.013"/> +        <volume_morph +          name="STOMACH" +          scale="0.0426 0.0426 0.0426" +          pos="0.077 0.0 -0.0"/> +        <volume_morph            name="BELLY"            scale="0.09 0.08 0.07"            pos="0 0 -0.05"/> @@ -4093,7 +4136,16 @@       value_max="2"       camera_elevation=".3"       camera_distance=".8"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.004 0.0 -0.01"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.004 0.0 -0.01"/> +      </param_morph>      </param>      <param @@ -4143,6 +4195,12 @@          <volume_morph            name="BELLY"            scale="0.0 0.02 0.0"/> +        <volume_morph +          name="LEFT_HANDLE" +          pos="0.0 0.025 0.0"/> +        <volume_morph +          name="RIGHT_HANDLE" +          pos="0.0 -0.025 0.0"/>        </param_morph>      </param> @@ -4162,7 +4220,16 @@       value_max="1.3"       camera_elevation=".3"       camera_distance=".8"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 -0.026 0.0"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.026 0.0"/> +      </param_morph>      </param>      <param @@ -4181,7 +4248,16 @@       value_max="1.1"       camera_elevation=".3"       camera_distance="1.2"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.01 -0.024 0.008"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="-0.01 0.024 0.008"/> +      </param_morph>      </param>      <!-- ############# #  @@ -4206,6 +4282,14 @@            scale="0.03 0.03 0.0"            pos="-0.03 0 0.02"/>          <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.008 -0.03 0.01"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.008 0.03 0.01"/> +        <volume_morph            name="L_CLAVICLE"            scale="0.02 0.0 0.01"            pos="-0.02 0 0"/> @@ -4376,7 +4460,16 @@       value_default="0"       value_min="-3"       value_max="3"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.0 -0.01"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.0 -0.01"/> +	  </param_morph>      </param>      <param @@ -4389,7 +4482,16 @@       value_default="0"       value_min="-1.25"       value_max="1.25"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 -0.026 0.0"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.026 -0.0"/> +	  </param_morph>      </param>      <param @@ -4402,7 +4504,12 @@       value_default="0"       value_min="-1"       value_max="1"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="STOMACH" +          scale="0.0 0.0 0.0" +          pos="0.0 0.0 0.05"/> +	  </param_morph>      </param>      <param @@ -4415,7 +4522,16 @@       value_default="0"       value_min="-2"       value_max="2"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="LEFT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.03 0.0"/> +        <volume_morph +          name="RIGHT_PEC" +          scale="0.0 0.0 0.0" +          pos="0.0 0.03 0.0"/> +	  </param_morph>      </param>      <!-- @@ -4949,7 +5065,11 @@       value_default="0"       value_min="-1"       value_max="1"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="BUTT" +          pos="0.0 0.0 0.05"/> +	  </param_morph>      </param>      <param @@ -4962,7 +5082,11 @@       value_default="0"       value_min="-1"       value_max="1"> -      <param_morph /> +      <param_morph> +        <volume_morph +          name="BUTT" +          pos="0.0 0.05 0.0"/> +	  </param_morph>      </param>      <!-- diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 5e73804f2d..48cf419246 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,11 +1,17 @@  <?xml version="1.0" encoding="US-ASCII" standalone="yes"?> -<linden_skeleton version="1.0" num_bones="46" num_collision_volumes="19"> +<linden_skeleton version="1.0" num_bones="52" num_collision_volumes="25">  <bone name="mPelvis" pos="0.000 0.000 1.067" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 1.067015">  	<collision_volume name="PELVIS" pos = "-0.01 0 -0.02" rot="0.000000 8.00000 0.000000" scale="0.12 0.16 0.17"/> +	<collision_volume name="BUTT" pos = "-0.06 0 -0.1" rot="0.000000 0.00000 0.000000" scale="0.1 0.1 0.1"/>  	<bone name="mTorso" pos="0.000 0.000 0.084" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.084073"> -		<collision_volume name="BELLY" pos = "0.028 0 0.04" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/> +		<collision_volume name="BELLY" pos = "0.04 0 0.028" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/> +		<collision_volume name="STOMACH" pos = "0.088 0 0.092" rot="0.000000 0.00000 0.000000" scale="0.09 0.13 0.15"/> +		<collision_volume name="LEFT_HANDLE" pos = "0.056 0.125 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/> +		<collision_volume name="RIGHT_HANDLE" pos = "0.056 -0.125 0.058" rot="0.000000 0.00000 0.000000" scale="0.05 0.05 0.05"/>  		<bone name="mChest" pos="-0.015 0.000 0.205" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.015368 0.000000 0.204877">  			<collision_volume name="CHEST" pos = "0.028 0 0.07" rot="0.000000 -10.00000 0.000000" scale="0.11 0.15 0.2"/> +			<collision_volume name="LEFT_PEC" pos = "0.119 0.082 0.042" rot="0.000000 4.29000 0.000000" scale="0.05 0.05 0.05"/> +			<collision_volume name="RIGHT_PEC" pos = "0.119 -0.082 0.042" rot="0.000000 4.29000 0.000000" scale="0.05 0.05 0.05"/>  			<bone name="mNeck" pos="-0.010 0.000 0.251" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.009507 0.000000 0.251108">  				<collision_volume name="NECK" pos = "0.0 0 0.02" rot="0.000000 0.000000 0.000000" scale="0.05 0.06 0.08"/>  				<bone name="mHead" pos="0.000 -0.000 0.076" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.000000 0.075630">  | 
