From b27492de06d0f5cbd45a892618ecb2d561a7181b Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 28 May 2015 17:28:49 -0400 Subject: SL-117 WIP - initial placeholders for wing, tail joints. Updated max joints to 48 and added some debugging. --- indra/newview/character/avatar_lad.xml | 110 ++++++++++++++++++++++++++++ indra/newview/character/avatar_skeleton.xml | 24 +++++- 2 files changed, 133 insertions(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 9ec6428ee6..ac0b8b5704 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -413,6 +413,116 @@ rotation="0 0 0" visible_in_first_person="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27,6 +33,14 @@ + + + + + + + + @@ -39,6 +53,14 @@ + + + + + + + + @@ -78,4 +100,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 590d0e35e542fe3d973e5a67e1a7db34c0429701 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 12 Aug 2015 15:23:57 -0400 Subject: SL-109 WIP - brought over work from SL-125 repo that was not dynamic skeleton related --- indra/newview/character/avatar_skeleton.xml | 42 +++++++++++++++-------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index f81e58e807..7a088484d8 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,9 +1,11 @@ - + - - - + + + + + @@ -15,6 +17,22 @@ + + + + + + + + + + + + + + + + @@ -33,14 +51,6 @@ - - - - - - - - @@ -53,14 +63,6 @@ - - - - - - - - -- cgit v1.2.3 From 2a57da233423ca3531bfcec2e138023afead4c3f Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 14 Aug 2015 15:00:08 -0400 Subject: SL-125 WIP - updated base bento repo excluding dynamic skeleton. --- indra/newview/character/avatar_lad_orig.xml | 12505 +++++++++++++++++++++ indra/newview/character/avatar_skeleton_orig.xml | 81 + 2 files changed, 12586 insertions(+) create mode 100644 indra/newview/character/avatar_lad_orig.xml create mode 100644 indra/newview/character/avatar_skeleton_orig.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad_orig.xml b/indra/newview/character/avatar_lad_orig.xml new file mode 100644 index 0000000000..9ec6428ee6 --- /dev/null +++ b/indra/newview/character/avatar_lad_orig.xml @@ -0,0 +1,12505 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_skeleton_orig.xml b/indra/newview/character/avatar_skeleton_orig.xml new file mode 100644 index 0000000000..6b07bbc1d3 --- /dev/null +++ b/indra/newview/character/avatar_skeleton_orig.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 217fb294340b63ce8b3ffa1503649396043c1881 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 19 Aug 2015 16:23:01 -0400 Subject: SL-135 WIP - added additional lad/skel configs --- indra/newview/character/avatar_lad_tentacles.xml | 12505 ++++++++++++++++++ indra/newview/character/avatar_lad_wings_tail.xml | 12615 +++++++++++++++++++ .../character/avatar_skeleton_tentacles.xml | 281 + .../character/avatar_skeleton_wings_tail.xml | 105 + 4 files changed, 25506 insertions(+) create mode 100644 indra/newview/character/avatar_lad_tentacles.xml create mode 100644 indra/newview/character/avatar_lad_wings_tail.xml create mode 100644 indra/newview/character/avatar_skeleton_tentacles.xml create mode 100644 indra/newview/character/avatar_skeleton_wings_tail.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad_tentacles.xml b/indra/newview/character/avatar_lad_tentacles.xml new file mode 100644 index 0000000000..9ec6428ee6 --- /dev/null +++ b/indra/newview/character/avatar_lad_tentacles.xml @@ -0,0 +1,12505 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_lad_wings_tail.xml b/indra/newview/character/avatar_lad_wings_tail.xml new file mode 100644 index 0000000000..ac0b8b5704 --- /dev/null +++ b/indra/newview/character/avatar_lad_wings_tail.xml @@ -0,0 +1,12615 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_skeleton_tentacles.xml b/indra/newview/character/avatar_skeleton_tentacles.xml new file mode 100644 index 0000000000..c232169b70 --- /dev/null +++ b/indra/newview/character/avatar_skeleton_tentacles.xml @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/character/avatar_skeleton_wings_tail.xml b/indra/newview/character/avatar_skeleton_wings_tail.xml new file mode 100644 index 0000000000..7a088484d8 --- /dev/null +++ b/indra/newview/character/avatar_skeleton_wings_tail.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From fbe58c1bdf565c95e01d67a98faa6f3d00b4df0c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 20 Aug 2015 16:45:02 -0400 Subject: SL-109 WIP - default av is wings+tail, others available with debug settings AvatarFileName and SkeletonFileName --- indra/newview/character/avatar_skeleton_tentacles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_tentacles.xml b/indra/newview/character/avatar_skeleton_tentacles.xml index c232169b70..9863a5cbfd 100644 --- a/indra/newview/character/avatar_skeleton_tentacles.xml +++ b/indra/newview/character/avatar_skeleton_tentacles.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.3 From 58992e2cb4ae2787b85cff63c3ed680cd99fa8ce Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 16 Oct 2015 15:05:29 -0400 Subject: SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered. --- .../character/avatar_skeleton_tentacles.xml | 307 ++++++++++----------- 1 file changed, 153 insertions(+), 154 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_tentacles.xml b/indra/newview/character/avatar_skeleton_tentacles.xml index 9863a5cbfd..929feaf25c 100644 --- a/indra/newview/character/avatar_skeleton_tentacles.xml +++ b/indra/newview/character/avatar_skeleton_tentacles.xml @@ -1,64 +1,63 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -69,16 +68,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -89,16 +88,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -109,16 +108,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -129,16 +128,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -149,16 +148,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -169,16 +168,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -189,16 +188,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -209,16 +208,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -229,16 +228,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -251,27 +250,27 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + -- cgit v1.2.3 From cdb96f8044fd609f92b9009450454e356008ca1c Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 13 Nov 2015 14:31:21 -0800 Subject: Post review changes. --- indra/newview/character/avatar_skeleton.xml | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 47182620d2..f3e845171f 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,6 +1,6 @@ - + @@ -11,12 +11,12 @@ - + - + @@ -37,11 +37,11 @@ - + - + - + @@ -49,25 +49,25 @@ - + - + - + - + - + - + - + - + @@ -75,26 +75,26 @@ - + - + - + - + - + - + -- cgit v1.2.3 From 3bfc2564a685f87dda38d423ca3c32f96efeedf1 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 16 Nov 2015 12:53:43 -0500 Subject: SL-201 WIP - avatar_skeleton.xml tweaks for aliases, removed wings and tail from default definition. --- indra/newview/character/avatar_lad.xml | 110 --------------------- indra/newview/character/avatar_skeleton.xml | 38 ++----- .../character/avatar_skeleton_wings_tail.xml | 40 ++++---- 3 files changed, 27 insertions(+), 161 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index ac0b8b5704..9ec6428ee6 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -413,116 +413,6 @@ rotation="0 0 0" visible_in_first_person="true" /> - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - @@ -17,22 +9,6 @@ - - - - - - - - - - - - - - - - @@ -43,9 +19,9 @@ - + - + @@ -79,10 +55,10 @@ - + - + @@ -92,10 +68,10 @@ - + - + diff --git a/indra/newview/character/avatar_skeleton_wings_tail.xml b/indra/newview/character/avatar_skeleton_wings_tail.xml index 7a088484d8..f3e845171f 100644 --- a/indra/newview/character/avatar_skeleton_wings_tail.xml +++ b/indra/newview/character/avatar_skeleton_wings_tail.xml @@ -1,6 +1,6 @@ - + @@ -11,12 +11,12 @@ - + - + @@ -37,11 +37,11 @@ - + - + - + @@ -49,25 +49,25 @@ - + - + - + - + - + - + - + - + @@ -75,26 +75,26 @@ - + - + - + - + - + - + -- cgit v1.2.3 From 062aea86157d466a82435010703c0458f43add11 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 3 Dec 2015 12:17:47 -0500 Subject: SL-276 WIP - skeleton based on avastar export of the avastar/mayastar combined skeleton proposal. --- indra/newview/character/avatar_skeleton.xml | 275 ++++++++++++++++++++-------- 1 file changed, 195 insertions(+), 80 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index df5a5b9020..2b5cc65f98 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,81 +1,196 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 02d286efee2708a68988116de3b4f69848f7cc91 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 9 Dec 2015 16:05:25 -0500 Subject: SL-276 WIP - updated avatar_skeleton.xml --- indra/newview/character/avatar_skeleton.xml | 435 +++++++++++++++------------- 1 file changed, 240 insertions(+), 195 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 2b5cc65f98..3e7b8c9eee 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,196 +1,241 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 6b22bb2e106f16096fa0b301185e066c38de025c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 10 Dec 2015 10:40:14 -0500 Subject: SL-276 WIP - fixed joint orientation issues for face --- indra/newview/character/avatar_skeleton.xml | 318 ++++++++++++++-------------- 1 file changed, 159 insertions(+), 159 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 3e7b8c9eee..dff95e8463 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,192 +1,186 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - + - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + - + - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + - + - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + @@ -194,14 +188,18 @@ - + + + + + - + @@ -214,7 +212,7 @@ - + @@ -222,20 +220,22 @@ - - - - - - - - + + + + + + + + + + -- cgit v1.2.3 From feb66a1c966e99ed89bd35014528392df8af6983 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 10 Dec 2015 14:12:54 -0500 Subject: SL-276 WIP - more joint updates. --- indra/newview/character/avatar_skeleton.xml | 430 ++++++++++++---------------- 1 file changed, 191 insertions(+), 239 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index dff95e8463..abc94b3d42 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,241 +1,193 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 5e6592bcff61b0bf92877a4e125d2f3da2778e9d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 11 Dec 2015 14:29:02 -0500 Subject: SL-276 WIP - finger updates in avatar_skeleton.xml --- indra/newview/character/avatar_skeleton.xml | 64 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index abc94b3d42..67516ceb62 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,5 +1,5 @@ - + @@ -64,32 +64,32 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -101,29 +101,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + -- cgit v1.2.3 From 8597d9e137328e7382f516d08bd776c774ba504f Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 11 Dec 2015 16:04:21 -0500 Subject: SL-276 WIP - joint end fixes in avatar_skeleton.xml --- indra/newview/character/avatar_skeleton.xml | 100 ++++++++++++++-------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 67516ceb62..961aaf3a70 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,5 +1,5 @@ - + @@ -17,42 +17,42 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -69,8 +69,8 @@ - - + + @@ -89,7 +89,7 @@ - + @@ -106,8 +106,8 @@ - - + + @@ -130,17 +130,17 @@ - + - + - + @@ -152,13 +152,13 @@ - + - + - + @@ -176,18 +176,18 @@ - - - - - - + + + + + + - + -- cgit v1.2.3 From ed08d220507a5b85a2c13c7122afd94db39bb676 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Sun, 13 Dec 2015 20:32:21 -0500 Subject: SL-277 WIP - Initial slider support for new joints --- indra/newview/character/avatar_lad.xml | 262 +++++++++++++++++++++++++++++++++ 1 file changed, 262 insertions(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 9ec6428ee6..c99b4a08a6 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -478,6 +478,13 @@ + + + + + + + @@ -624,6 +631,17 @@ + + + + + + + + + + + @@ -662,6 +680,10 @@ + + + + @@ -693,6 +715,11 @@ name="mHipRight" scale="0 0 0" offset="0 -.004 0" /> + + + + + @@ -774,6 +801,17 @@ name="mEyeRight" scale="0 0 0" offset="0 -.009 0" /> + + + + + @@ -797,6 +835,17 @@ name="mEyeRight" scale="0 0 0" offset="0 0 -.004" /> + + + + + @@ -820,6 +869,17 @@ name="mEyeRight" scale="0 0 0" offset=".016 0 0" /> + + + + + @@ -843,6 +903,15 @@ name="mEyeRight" scale="0 0 0" offset=".005 0 0" /> + + + @@ -878,6 +947,147 @@ name="mEyeRight" scale="1 1 1" offset="0 0 0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -951,6 +1161,47 @@ name="mWristLeft" scale="1 1 1" offset="0 0 0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -997,6 +1248,17 @@ name="mEyeRight" scale="0 0 0" offset="-.005 0 0" /> + + + + + -- cgit v1.2.3 From 12d7411a16ea220c5fbc389b68f5f002b2423659 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 14 Dec 2015 11:48:23 -0500 Subject: SL-278 WIP - Attachment points for new joints --- indra/newview/character/avatar_lad.xml | 202 +++++++++++++++++++++++++++------ 1 file changed, 168 insertions(+), 34 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index c99b4a08a6..3b85f5de9b 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -73,7 +73,7 @@ joint="mFootLeft" position="0 0.0 0.0" rotation="0 0 0" - visible_in_first_person="true"/> + visible_in_first_person="true"/> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="false"/> + + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="true" /> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="true" /> + + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Tue, 15 Dec 2015 07:34:45 -0500 Subject: SL-276, SL-124 - code and config file cleanup for Bento --- indra/newview/character/avatar_lad.xml | 2 +- indra/newview/character/avatar_lad_tentacles.xml | 12505 ------------------ indra/newview/character/avatar_lad_wings_tail.xml | 12615 ------------------- indra/newview/character/avatar_skeleton.xml | 3 +- .../character/avatar_skeleton_tentacles.xml | 280 - .../character/avatar_skeleton_wings_tail.xml | 105 - 6 files changed, 2 insertions(+), 25508 deletions(-) delete mode 100644 indra/newview/character/avatar_lad_tentacles.xml delete mode 100644 indra/newview/character/avatar_lad_wings_tail.xml delete mode 100644 indra/newview/character/avatar_skeleton_tentacles.xml delete mode 100644 indra/newview/character/avatar_skeleton_wings_tail.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 3b85f5de9b..220d400045 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,6 +1,6 @@ + version="2.0" wearable_definition_version="22"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/character/avatar_lad_wings_tail.xml b/indra/newview/character/avatar_lad_wings_tail.xml deleted file mode 100644 index ac0b8b5704..0000000000 --- a/indra/newview/character/avatar_lad_wings_tail.xml +++ /dev/null @@ -1,12615 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 961aaf3a70..72b035b9c9 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,5 +1,4 @@ - - + diff --git a/indra/newview/character/avatar_skeleton_tentacles.xml b/indra/newview/character/avatar_skeleton_tentacles.xml deleted file mode 100644 index 929feaf25c..0000000000 --- a/indra/newview/character/avatar_skeleton_tentacles.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/character/avatar_skeleton_wings_tail.xml b/indra/newview/character/avatar_skeleton_wings_tail.xml deleted file mode 100644 index f3e845171f..0000000000 --- a/indra/newview/character/avatar_skeleton_wings_tail.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 3bc48113e74d1f7861b6c846a46a05b733cbd7e6 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 4 Jan 2016 10:51:29 -0500 Subject: SL-301 FIX - typo in avatar_lad.xml --- indra/newview/character/avatar_lad.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 220d400045..4a7d0f5ba4 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1163,7 +1163,7 @@ offset="0 0 0" /> -- cgit v1.2.3 From b3916c8bfdcc02808a21e3d1b27438da756b2176 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 20 Jan 2016 11:07:02 -0500 Subject: SL-276 WIP - removed avatar_XXX_orig.xml files. --- indra/newview/character/avatar_lad_orig.xml | 12505 --------------------- indra/newview/character/avatar_skeleton_orig.xml | 81 - 2 files changed, 12586 deletions(-) delete mode 100644 indra/newview/character/avatar_lad_orig.xml delete mode 100644 indra/newview/character/avatar_skeleton_orig.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad_orig.xml b/indra/newview/character/avatar_lad_orig.xml deleted file mode 100644 index 9ec6428ee6..0000000000 --- a/indra/newview/character/avatar_lad_orig.xml +++ /dev/null @@ -1,12505 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/character/avatar_skeleton_orig.xml b/indra/newview/character/avatar_skeleton_orig.xml deleted file mode 100644 index 6b07bbc1d3..0000000000 --- a/indra/newview/character/avatar_skeleton_orig.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From f1e6f5c72a1df374252698f68de51de4d4238cc4 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 23 Feb 2016 09:34:40 -0500 Subject: SL-287 WIP - fixed default avatar crash caused by added spine joints. Still renders distorted. --- .../character/avatar_skeleton_spine_joints.xml | 198 +++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 indra/newview/character/avatar_skeleton_spine_joints.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_spine_joints.xml b/indra/newview/character/avatar_skeleton_spine_joints.xml new file mode 100644 index 0000000000..4124df9055 --- /dev/null +++ b/indra/newview/character/avatar_skeleton_spine_joints.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 3956efc4fa93d75820e6f3bbe54e040d415b41ad Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 26 Feb 2016 10:11:17 -0500 Subject: SL-287 - default avatar handles position changes caused by extra spine joints --- .../character/avatar_skeleton_spine_joints.xml | 242 ++++++++++----------- 1 file changed, 121 insertions(+), 121 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_spine_joints.xml b/indra/newview/character/avatar_skeleton_spine_joints.xml index 4124df9055..c7cdc49838 100644 --- a/indra/newview/character/avatar_skeleton_spine_joints.xml +++ b/indra/newview/character/avatar_skeleton_spine_joints.xml @@ -2,150 +2,151 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + @@ -168,7 +169,6 @@ - -- cgit v1.2.3 From 2a4ed560c4559b7cd6b881eb596ddc9c2e81777b Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 26 Feb 2016 16:09:13 -0500 Subject: SL-287 WIP - avatar_skeleton_spine_joints.xml has 4 added joints, 2 between mPelvis and mTorso, 2 between mTorso and mChest. --- .../character/avatar_skeleton_spine_joints.xml | 246 +++++++++++---------- 1 file changed, 124 insertions(+), 122 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_spine_joints.xml b/indra/newview/character/avatar_skeleton_spine_joints.xml index c7cdc49838..c88a3a227d 100644 --- a/indra/newview/character/avatar_skeleton_spine_joints.xml +++ b/indra/newview/character/avatar_skeleton_spine_joints.xml @@ -1,151 +1,153 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + -- cgit v1.2.3 From 789aa5e742c4f4d322576dda91d281a4487884a8 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 1 Mar 2016 11:30:01 -0500 Subject: SL-276 WIP - final bento skeleton candidate in avatar_skeleton.xml. --- indra/newview/character/avatar_skeleton.xml | 367 +++++++++++++++------------- 1 file changed, 197 insertions(+), 170 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 72b035b9c9..223a367c48 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,192 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + - - + + -- cgit v1.2.3 From 5960e7fbdbf018f1325ed9f72eb7e783944bc8ce Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 1 Mar 2016 17:46:12 -0500 Subject: SL-276 WIP - small tweaks to avatar_skeleton.xml, including bone group names. --- indra/newview/character/avatar_skeleton.xml | 408 ++++++++++++++-------------- 1 file changed, 204 insertions(+), 204 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 223a367c48..31a52e1c07 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,219 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + - - + - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + - - + -- cgit v1.2.3 From 27203e1b356474b877435d061bd8eb40a63552dd Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 2 Mar 2016 16:52:14 -0500 Subject: SL-276 WIP - restored leading xml tag in avatar_skeleton.xml. --- indra/newview/character/avatar_skeleton.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 31a52e1c07..b6661471dc 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,3 +1,4 @@ + -- cgit v1.2.3 From 9ca9a44acfc06de529489d76eea934ed6652fe81 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 4 Mar 2016 09:29:01 -0500 Subject: SL-344 WIP - updated some sliders based on the revised bento skeleton. --- indra/newview/character/avatar_lad.xml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 4a7d0f5ba4..a1af48952b 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -613,9 +613,7 @@ name="mKneeRight" scale=".05 .05 .1" /> - - - + @@ -1053,7 +1051,7 @@ id="655" group="1" name="Head Size" - label="Head Size" + label="Head Size" wearable="shape" edit_group="shape_head" label_min="Small Head" @@ -1072,6 +1070,11 @@ scale="1 1 1" offset="0 0 0" /> + + + + + + Date: Tue, 8 Mar 2016 10:27:16 -0500 Subject: SL-276 WIP - avatar_skeleton.xml changes, moved spine joints to spine group, fixed position mismatch between eyes and alt eyes. --- indra/newview/character/avatar_skeleton.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index b6661471dc..b1f54e94bb 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -3,15 +3,15 @@ - - + + - - + + @@ -34,10 +34,10 @@ - + - + -- cgit v1.2.3 From 87b1e57079c246fc795e481ba7214e7d507d7a1e Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 8 Mar 2016 10:45:12 -0500 Subject: SL-276 WIP - removed avatar_skeleton_spine_joints.xml --- .../character/avatar_skeleton_spine_joints.xml | 200 --------------------- 1 file changed, 200 deletions(-) delete mode 100644 indra/newview/character/avatar_skeleton_spine_joints.xml (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton_spine_joints.xml b/indra/newview/character/avatar_skeleton_spine_joints.xml deleted file mode 100644 index c88a3a227d..0000000000 --- a/indra/newview/character/avatar_skeleton_spine_joints.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From d56533609431b213810928d204e3720fecd42b82 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 8 Mar 2016 11:30:31 -0500 Subject: SL-344.xml - avatar_lad.xml updates. During loading, error out if an attachment_point references an invalid parent. --- indra/newview/character/avatar_lad.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index a1af48952b..749fb65a01 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -490,7 +490,7 @@ group="8" pie_slice="7" name="Alt Left Ear" - joint="mFaceEarLeft" + joint="mFaceEar1Left" position="0.000 0.000 0.000" rotation="0 0 0" visible_in_first_person="true"/> @@ -500,7 +500,7 @@ group="8" pie_slice="8" name="Alt Right Ear" - joint="mFaceEarRight" + joint="mFaceEar1Right" position="0.000 0.000 0.000" rotation="0 0 0" visible_in_first_person="true"/> -- cgit v1.2.3 From 132a2587dff85006636d8092ae1b34081f12fe69 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 11 Mar 2016 09:29:37 -0500 Subject: SL-344 WIP - more slider support for bento joints --- indra/newview/character/avatar_lad.xml | 336 ++++++++++++++++++++++++++++++++- 1 file changed, 335 insertions(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 749fb65a01..2aa90969c9 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,5 +1,5 @@ - @@ -944,6 +944,57 @@ scale="0 0 0 " offset="0 -.009 0" /> + + + + + + + + + + + + + + + + + + + + + @@ -976,8 +1027,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1011,6 +1191,83 @@ name="mFaceEyeAltRight" scale="0 0 0" offset=".016 0 0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1044,6 +1301,58 @@ name="mFaceEyeAltRight" scale="0 0 0" offset=".005 0 0" /> + + + + + + + + + + + + + + + + + + + + + + @@ -1100,6 +1409,11 @@ scale="1 1 1" offset="0 0 0" /> + + + + + + + + + + -- cgit v1.2.3 From cbbe82b8dc08260aa4102214a7c99aeab7915371 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 22 Mar 2016 16:18:46 -0400 Subject: SL-276, SL-344 - Skeleton and slider updates including new face joints to enable nose, eye slider controls. Increased max joint count. --- indra/newview/character/avatar_lad.xml | 13218 +++++++++++++++----------- indra/newview/character/avatar_skeleton.xml | 165 +- 2 files changed, 7500 insertions(+), 5883 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 2aa90969c9..5802b6e2fd 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,6 +1,6 @@ - + + visible_in_first_person="true"/> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="false"/> + + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="false" /> + visible_in_first_person="false"/> + visible_in_first_person="true" /> + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - + visible_in_first_person="true" /> + + visible_in_first_person="true"/> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> + visible_in_first_person="true" /> - - + + - @@ -1103,7 +1103,7 @@ scale="0 0 0" offset="0 0 .004" /> - @@ -1268,7 +1268,7 @@ name="mFaceCheekUpperInnerRight" scale="0 0 0" offset="-0.005 0 0" /> - + @@ -1360,7 +1360,7 @@ id="655" group="1" name="Head Size" - label="Head Size" + label="Head Size" wearable="shape" edit_group="shape_head" label_min="Small Head" @@ -1383,7 +1383,7 @@ name="mFaceRoot" scale="1 1 1" offset="0 0 0" /> - + - - @@ -1720,7 +1718,7 @@ scale="0 0 0" offset="-.005 0 0" /> - @@ -1827,7 +1825,8 @@ scale="0 0 .5" /> - - - - - - + - - + id="30002" + group="0" + name="Nose_Big_Out" + value_min="-0.8" + value_max="2.5"> + + + + + - - + - + - + name="Broad_Nostrils" + value_min="-.5" + value_max="1"> + + + + - + - - + name="Bulbous_Nose" + value_min="-.5" + value_max="1.5" + > + + + + + + + - + name="Wide_Nose" + value_min="-.5" + value_max="1"> + + + + + - - + name="Crooked_Nose" + value_min="-2" + value_max="2"> + + + + + + + + + + + + + + + + - - - + + + + + + + + - + name="Lip Width" + value_min="-0.9" + value_max="1.3" + value_default="0"> + + + + + + + + + + + + + + - - + name="Tall_Lips" + value_min="-1" + value_max="2"> + + + + + + + + + + + + + + - - + + + - + - - + value_max="0.7"> + + + + + + + + + + + + + + + + + + + + - - + value_max="1"> + + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value_max="1.4"> + + + + + + + + + + + + + + + + + - - + value_max="1.4"> + + + - - - + - - - + + + - - - + + + + + - - - + - - + - + - - + id="30764" + group="0" + name="Lip_Cleft_Deep" + value_min="-.5" + value_max="1.2"> + + + + + + + + + + - - + name="Wide_Lip_Cleft" + value_min="-.8" + value_max="1.5"> + + + + + - - + - + - - + value_max="2"> + + - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + value_max="2"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="30035" + group="0" + name="Big_Ears" + value_min="-1" + value_max="2"> + + + + - + - - - + value_max="1.5"> + + + + + + + - + id="30796" + group="0" + name="Pointy_Ears" + value_min="-.4" + value_max="3"> + + + + - + - - + + - - - + - - - + + + + + + + + + + + - + + + - + - - + id="30024" + group="0" + name="Wide_Eyes" + value_min="-1.5" + value_max="2"> + + + + + + + + + + + + - - + name="Eyelid_Corner_Up" + value_min="-1.3" + value_max="1.2"> + + + + + + - + name="Puffy_Lower_Lids" + value_min="-.3" + value_max="2.5"> + + + + + + + - + name="Forehead Angle" + value_min="0" + value_max="1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + value_max="1.5"> + + + + + + + - + id="30027" + group="0" + name="Wide_Nose_Bridge" + value_min="-1.3" + value_max="1.2"> + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + value_max="1.3" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + value_max="1.3" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + edit_group_order="5" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default="0.14" + camera_elevation=".1" + camera_distance=".5" + camera_angle="90"> + edit_group_order="6" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default=".7" + camera_elevation=".1" + camera_distance=".5" + camera_angle="90"> + edit_group_order="7" + label_min="Less" + label_max="More" + value_min="-1" + value_max="1" + value_default="0.05" + camera_elevation=".1" + camera_distance=".7" + camera_angle="90"> - - - - - - - - - - - - - - - - - - - - + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="20"> + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + id="147" + group="1" + clothing_morph="true" + name="Bangs_Sides_Down" + label="Side Bangs Down" + wearable="hair" + edit_group="hair_style" + label_min="Side Bangs" + label_max="Side Bangs Down" + value_min="0" + value_max="2" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="150"> + camera_distance=".5" + camera_angle="150"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="20"> + camera_distance=".5" + camera_angle="150"> - + camera_distance=".5" + camera_angle="150"> + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - - - - + camera_distance=".5" + camera_angle="90"> + camera_distance=".5" + camera_angle="90"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + camera_distance=".5" + camera_angle="0"> + id="640" + group="1" + name="Hair_Egg_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="-1.3" + value_max="1"> + id="641" + group="1" + name="Hair_Squash_Stretch_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="-.5" + value_max="1"> + id="642" + group="1" + name="Hair_Square_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> + id="643" + group="1" + name="Hair_Round_Head" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> + value_max="1"> + id="645" + group="1" + name="Hair_Forehead_Slant" + wearable="hair" + edit_group="hair_style" + cross_wearable="true" + value_min="0" + value_max="1"> - - - - - - - - - - - - - - + camera_distance=".5" + camera_angle="100"> + camera_distance=".5" + camera_angle="30"> + camera_distance=".5" + camera_angle="160"> @@ -3331,775 +3751,895 @@ - - - + clothing_morph="true" + name="Hair_Pigtails_Short" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> + + value_max="1"> + value_max="1"> + clothing_morph="true" + name="Hair_Pigtails_Long" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> + value_max="1"> + id="787" + group="1" + name="Hair_Ponytail_Med" + wearable="hair" + edit_group="hair_style" + value_min="0" + value_max="1"> - + value_max="1"> + - - - + + + + + + + + + + + + + + + + + + + + id="20001" + group="0" + name="Big_Brow" + value_min="-.3" + value_max="2"> + name="Nose_Big_Out" + value_min="-0.8" + value_max="2.5"> + id="20517" + group="0" + name="Wide_Nose" + value_min="-.5" + value_max="1"> - + name="Bulbous_Nose" + value_min="-.5" + value_max="1.5"> - + + value_max="2"> - + + id="20004" + group="0" + name="Broad_Nostrils" + value_min="-.5" + value_max="1"> + id="20653" + group="0" + name="Tall_Lips" + value_min="-1" + value_max="2"> - + + id="20506" + group="0" + name="Mouth_Height" + value_min="-2" + value_max="2"> + + + + - + id="20025" + group="0" + name="Wide_Lip_Cleft" + value_min="-.8" + value_max="1.5"> + - + + value_default="0"> - + - - - + value_max="2"> + - + + + + + + + + + + + + + + value_max="2"> - + + + + + + value_max="1.2"> + + + + + label_min="High" + label_max="Low" + value_min="-1" + value_max="1.5" + value_default="0.5" + camera_elevation=".1" + camera_distance=".3" + camera_angle="-20"> + edit_group_order="6" + label_min="Round" + label_max="Cleft" + value_min="-.1" + value_max="1" + camera_elevation="0" + camera_distance=".28" + camera_angle="-20"> + edit_group="shape_nose" + edit_group_order="8" + label_min="Pointy" + label_max="Bulbous" + value_min="-.3" + value_max="1" + camera_elevation=".1" + camera_distance=".35" + camera_angle="15"> + edit_group="shape_chin" + edit_group_order="1" + label_min="Chin Out" + label_max="Chin In" + value_min="-.5" + value_max=".5" + camera_elevation=".1" + camera_distance=".4" + camera_angle="45"> - - + id="8" + group="0" + name="Double_Chin" + label="Chin-Neck" + wearable="shape" + edit_group="shape_chin" + edit_group_order="8" + label_min="Tight Chin" + label_max="Double Chin" + value_min="-.5" + value_max="1.5" + camera_elevation="-.1" + camera_distance=".3" + camera_angle="60"> + id="20010" + group="0" + name="Sunken_Cheeks" + value_min="-1.5" + value_max="3"> + id="20011" + group="0" + name="Noble_Nose_Bridge" + value_min="-.5" + value_max="1.5"> + id="20758" + group="0" + name="Lower_Bridge_Nose" + value_min="-1.5" + value_max="1.5"> + id="12" + group="0" + name="Jowls" + wearable="shape" + edit_group="shape_chin" + edit_group_order="5" + label_min="Less" + label_max="More" + value_min="-.5" + value_max="2.5" + camera_elevation=".1" + camera_distance=".4" + camera_angle="0"> + value_max="1.5" + camera_elevation="0" + camera_distance=".28" + camera_angle="-20"> + - + name="Pointy_Eyebrows" + label="Eyebrow Points" + wearable="hair" + edit_group="hair_eyebrows" + edit_group_order="4" + label_min="Smooth" + label_max="Pointy" + value_min="-.5" + value_max="1" + camera_elevation=".1" + camera_distance=".3"> + + id="17" + group="0" + name="Square_Jaw" + label="Jaw Shape" + wearable="shape" + edit_group="shape_chin" + edit_group_order="2" + label_min="Pointy" + label_max="Square" + value_min="-.5" + value_max="1" + camera_distance=".3" + camera_elevation=".04" + camera_angle="-20"> + id="20018" + group="0" + name="Puffy_Upper_Cheeks" + value_min="-1.5" + value_max="2.5"> + id="19" + group="0" + name="Upturned_Nose_Tip" + label="Nose Tip Angle" + wearable="shape" + edit_group="shape_nose" + edit_group_order="7" + label_min="Downturned" + label_max="Upturned" + value_min="-1.5" + value_max="1" + camera_elevation=".1" + camera_distance=".35" + camera_angle="15"> - + + id="21" + group="0" + name="Upper_Eyelid_Fold" + label="Upper Eyelid Fold" + wearable="shape" + edit_group="shape_eyes" + edit_group_order="5" + label_min="Uncreased" + label_max="Creased" + value_min="-0.2" + value_max="1.3" + camera_elevation=".1" + camera_distance=".35"> + value_max="1" + camera_elevation=".1" + camera_distance=".3" + camera_angle="45"> + id="23" + group="0" + name="Baggy_Eyes" + label="Eye Bags" + wearable="shape" + edit_group="shape_eyes" + edit_group_order="6" + label_min="Smooth" + label_max="Baggy" + value_min="-.5" + value_max="1.5" + camera_elevation=".1" + camera_distance=".35"> + value_max=".7"> + id="20027" + group="0" + name="Wide_Nose_Bridge" + value_min="-1.3" + value_max="1.2"> + value_max="2"> + name="Wide_Upper_Lip" + wearable="shape" + edit_group="driven" + value_min="-.7" + value_max="1.3"> + name="Wide_Lower_Lip" + wearable="shape" + edit_group="driven" + value_min="-.7" + value_max="1.3"> + - - + + name="Lower_Eyebrows" + label="Eyebrow Height" + show_simple="true" + wearable="hair" + edit_group="hair_eyebrows" + edit_group_order="2.5" + label_min="Higher" + label_max="Lower" + value_min="-2" + value_max="2"> + name="Egg_Head" + label="Egg Head" + wearable="shape" + edit_group="shape_head" + label_min="Chin Heavy" + label_max="Forehead Heavy" + value_min="-1.3" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - - + edit_group="shape_head" + label_min="Squash Head" + label_max="Stretch Head" + value_min="-.5" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + value_max=".7" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> - + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + + value_max="2"> + + + + + + + + + value_max="1.4" + camera_distance=".3" + camera_elevation=".04"> + value_max="1.2" + camera_distance=".3" + camera_elevation=".04"> + value_max="1.5" + camera_distance=".3" + camera_elevation=".04"> - - - - - - - - - - - - - - + + + - - + + + + camera_elevation=".1" + camera_distance=".35"> + label="Jaw Angle" + edit_group="shape_chin" + edit_group_order="3.5" + label_min="Low Jaw" + label_max="High Jaw" + value_min="-1.2" + value_max="2" + value_default="0" + camera_distance=".5" + camera_elevation=".04" + camera_angle="70"> + value_default="0"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + label="Eye Depth" + edit_group="shape_eyes" + edit_group_order="4.5" + label_min="Sunken Eyes" + label_max="Bug Eyes" + value_min="-2" + value_max="2" + value_default="0"> + + + + + + + + + - @@ -4517,835 +4939,578 @@ + --> + - - - - - - - + - - - - + value_max="1"> + + - - - - + value_max="1"> + - - - - + value_max="1"> + - - - - - - - - + value_max="1"> + - - - - - - - - - - - + value_max="1"> + - - - - - - - - - - - + value_max="1"> + - - - - - - - - - - - - - - - - - - - + value_max="1"> + - - - - - - - + value_max="1"> + + + + + + + + + + + + + + + + + shared="1" + id="660" + group="1" + name="Shear_Head" + wearable="shape" + label="Shear Face" + edit_group="shape_head" + label_min="Shear Left" + label_max="Shear Right" + value_min="-2" + value_max="2" + value_default="0" + camera_distance=".5" + camera_elevation=".04"> - - - - - - + value_max="1" + value_default="0" + camera_distance=".5" + camera_elevation=".04"> + - - - - + camera_distance=".5" + camera_elevation=".04" + camera_angle="-20"> + - + - - - - + edit_group="shape_eyes" + label_min="Uncreased" + label_max="Creased" + value_min="-0.2" + value_max="1.3" + camera_elevation=".1" + camera_distance=".35"> + - - - - - - - - - - - - - - - + name="Egg_Head" + label="Egg Head" + wearable="shape" + edit_group="shape_head" + label_min="Chin Heavy" + label_max="Forehead Heavy" + value_min="-1.3" + value_max="1" + camera_elevation=".1" + camera_distance=".5" + camera_angle="20"> + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + name="Express_Frown" + value_min="0" + value_max="1"> + - - - - - - + name="Express_Laugh_Emote" + value_min="0" + value_max="1"> + + + - - - + - - - - + name="Express_Smile" + value_min="0" + value_max="1"> + - - - - - - - - + ############## + # other morphs (not user controlled) + ############## + --> + + + - - + + + + - + + + - + + + + - + value_max="1" + camera_elevation=".1" + camera_distance="1" + camera_angle="15"> - + name="LEFT_PEC" + scale="0.0273 0.0273 0.0273" + pos="0.038 0.024 -0.016"/> + + + value_max="1" + camera_elevation="0" + camera_distance=".28"> + name="LEFT_PEC" + scale="-0.05 0.0 0.0" + pos="-0.01 -0.01 -0.02"/> - + name="RIGHT_PEC" + scale="-0.05 0.0 0.0" + pos="-0.01 -0.01 -0.02"/> + + value_max="1" + camera_elevation="0" + camera_distance=".28"> - - + name="LEFT_PEC" + scale="-0.051 0.0 0.0" + pos="-0.02 -0.01 -0.03"/> - + name="RIGHT_PEC" + scale="-0.051 0.0 0.0" + pos="-0.02 -0.01 -0.03"/> + - - + value_max="1.4" + camera_elevation=".3" + camera_distance="1.2"> + + name="L_CLAVICLE" + scale="0.02 0.0 0.005" + pos="0.0 0 0.005"/> + name="L_UPPER_ARM" + scale="0.015 0.0 0.005" + pos="0.015 0 0"/> + name="L_LOWER_ARM" + scale="0.005 0.0 0.005" + pos="0.005 0 0"/> + + + + edit_group="shape_torso" + label_min="Regular" + label_max="Scrawny" + value_min="0" + value_max="1.3" + camera_elevation=".3" + camera_distance="1.2"> + name="BELLY" + scale="0.0 -0.01 0.0" + pos="0.0 0.0 0"/> + name="UPPER_BACK" + scale="-0.01 -0.01 0.0" + pos="0.0 0.0 0"/> + name="CHEST" + scale="-0.01 -0.01 0.0" + pos="0.01 0.0 0"/> + name="L_CLAVICLE" + scale="0.0 -0.03 -0.005" + pos="0.0 0 -0.005"/> + + + + + - + value_max="1.3" + camera_elevation=".3" + camera_distance="1.2"> + + + + + + + + + + + - + camera_elevation=".3"> + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + camera_elevation=".3" + camera_distance=".8"> + name="LEFT_PEC" + scale="0.0 0.0 0.0" + pos="0.004 0.0 -0.01"/> + name="RIGHT_PEC" + scale="0.0 0.0 0.0" + pos="0.004 0.0 -0.01"/> - + - - - - - - - - + edit_group="driven" + value_default="0" + value_min="-1" + value_max="2"> - + name="BELLY" + scale="0.0 0.02 0.0"/> + name="LOWER_BACK" + scale="0.0 0.02 0.0"/> + name="LEFT_HANDLE" + pos="0.0 0.025 0.0"/> + name="RIGHT_HANDLE" + pos="0.0 -0.025 0.0"/> + edit_group="shape_torso" + edit_group_order="8" + label_min="Separate" + label_max="Join" + value_default="0" + value_min="-.3" + value_max="1.3" + camera_elevation=".3" + camera_distance=".8"> + name="LEFT_PEC" + scale="0.0 0.0 0.0" + pos="0.0 -0.026 0.0"/> + - - + - + value_min="-0.5" + value_max="1.1" + camera_elevation=".3" + camera_distance="1.2"> + + + + - + - + + + + + + + + + + + + + + - - - - + - - - + - - - - - - - - - - - - - - - - - - - - + name="Hands_Relaxed_L" + value_min="0" + value_max="1"> + name="Hands_Point_L" + value_min="0" + value_max="1"> - - - + name="Hands_Fist_L" + value_min="0" + value_max="1"> + name="Hands_Relaxed_R" + value_min="0" + value_max="1"> - - - - - - - - - - - - - - - - - - - - - - - - - + value_max="1"> - - - - - - - - + - + + + + - + value_default="0" + value_min="-1.25" + value_max="1.25"> + + + + - + value_max="1"> + + + - - - - - - - + value_min="-2" + value_max="2"> + + + + + + + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> + reference="avatar_upper_body.llm"> - - + + + - - - - + value_max="1"> + + - - - + + + + - - - + value_max="1"> + + + + - - - - - - - - - - - - - - - - - + value_max="1.5" + camera_distance="1.3" + camera_elevation="-.5"> + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + value_max="1.5" + camera_distance="1.3" + camera_elevation="-.5"> + + + + + + + - - + + + + + + + - - - - - + camera_distance="1.5" + camera_elevation="-.5"> + - - - - - + camera_distance="1.5" + camera_elevation="-.5"> + + + + + - - - - - - - - - - + camera_distance="1.3" + camera_elevation="-.5"> + + - + + + - + + + - - + + - - - - - - + value_max="2" + camera_angle="15" + camera_distance="1.5" + camera_elevation="-1"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + value_max="1.5" + camera_distance="1.8" + camera_angle="30" + camera_elevation="-.3"> + + - - + + - - - - - - + + + - - - + + + + + + + + + - - - + + + + - - + - - - + + + - - - - - - - - - + + + + - - - + + + + - - - + + + + + + - - + + + + + - - - + - - - - + - - + + + + - - - + + + + - - - - - - + + + + + + + - - - + + + + - - - - + + + + + - - - - - - + + + + - - - - + + + + + + - - - - - + + + + - - - - - - - - + + + + + - - - + + + + - - - + + + + - - - - + + + - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - + + + - + + + - + + + - + + + - + + + + - + + + + - + - + + - - - + + - - - - + + - - - - - + + - - - - + + + + + - - - + - + - + + + - + + + + + - + + + - + - + - - - + - - - + - - - - + - - - - + - + + + + - + + + + + - + - + - + - + - + - + - + - + - + - + + + - + + + - + + + - + + + - + + + - + + + - + - + - + - + - + - + - - - + + + + - - - + + + + + + - - - + + - - - - + + - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + + - + + + - + + + + - + + + + + - + + + - + + + - + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + color="0, 0, 0, 0" /> + color="0, 0, 0, 128" /> + + + + + + + + + +color="255, 255, 255, 0" /> + + color="255, 255, 255, 64" /> + + + - + camera_elevation=".07"> + + color="198, 71, 71, 0" /> + color="198, 71, 71, 255" /> + + + + - + camera_distance=".25"> + + + + + + name="wrinkles_shading" + render_pass="bump" + fixed_color="0,0,0,100"> + value_max="1"> + domain="0.3" /> + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - +name="eyebrowsbump" +render_pass="bump"> - - - - - - - - - - - - + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - - - - - - + value_max="1" + value_default="0.5"> - - - - + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - - - - - - - + name="lipstick"> + value_default=".25" + camera_distance=".25"> + color="245,161,177,200" /> - - + color="216,37,67,200" /> - - + color="178,48,76,200" /> - - + color="68,0,11,200" /> - - + color="252,207,184,200" /> - - + color="241,136,106,200" /> - + + - + - - - - - - + + + + value_max=".9" + value_default="0.0" + camera_distance=".25"> + tga_file="lipstick_alpha.tga" + skip_if_zero="true" + domain="0.05" /> - - - - - - - - - - + name="lipgloss" + fixed_color="255,255,255,190"> - - - - - + value_max="1" + camera_distance=".25"> + - + name="blush"> + + + + value_max="1" + value_default=".5" + camera_distance=".3" + camera_elevation=".07" + camera_angle="20"> + color="253,162,193,200" /> - - - + color="247,131,152,200" /> - - - + - - - - - + - - + - - + color="195,128,122,200" /> + color="148,103,100,200" /> + + - + value_default=".5" + camera_distance=".3" + camera_elevation=".07" + camera_angle="20"> + + color="255,255,255,0" /> + color="255,255,255,255" /> + + + id="708" + group="0" + wearable="skin" + edit_group="skin_makeup" + edit_group_order="11" + name="Out Shdw Color" + label_min="Light" + label_max="Dark" + value_min="0" + value_max="1" + camera_distance=".3" + camera_elevation=".14"> + color="252,247,246,255" /> - - + color="255,206,206,255" /> - + + - - + - - - + - - - + - - - + - - - - + - - + - - + color="223,227,213,255" /> - - + color="96,116,87,255" /> - - + color="88,143,107,255" /> + color="194,231,223,255" /> + + + + + + + + + + + + + + + + + + + + + + - + value_default=".6" + camera_distance=".3" + camera_elevation=".14"> + + color="255,255,255,0" /> + color="255,255,255,255" /> - - - - + value_max=".7" + camera_distance=".3" + camera_elevation=".14"> + + - - + camera_distance=".3" + camera_elevation=".14"> + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + value_default="0" + camera_distance=".3" + camera_elevation=".14"> + tga_file="eyeshadow_inner_alpha.tga" + skip_if_zero="true" + domain="0.2" /> + name="eyeliner" + fixed_color="0,0,0,200"> + camera_distance=".3" + camera_elevation=".14"> + camera_distance=".3" + camera_elevation=".14"> + color="24,98,40,250" /> + + color="9,100,127,250" /> + + color="61,93,134,250" /> + + color="70,29,27,250" /> + + color="115,75,65,250" /> + + color="100,100,100,250" /> + + color="91,80,74,250" /> + + color="112,42,76,250" /> + + color="14,14,14,250" /> + + + name="facialhair bump" + render_pass="bump"> + tga_file="head_hair.tga" + file_is_mask="false" /> + name="Sideburns bump" + value_min="0" + value_max="1"> + tga_file="facehair_sideburns_alpha.tga" + skip_if_zero="true" + domain="0.05" /> + name="Moustache bump" + value_min="0" + value_max="1"> + tga_file="facehair_moustache_alpha.tga" + skip_if_zero="true" + domain="0.05" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + value_max="1"> + tga_file="facehair_soulpatch_alpha.tga" + skip_if_zero="true" + domain="0.1" /> + wearable="hair" + name="Chin Curtains bump" + value_min="0" + value_max="1"> + tga_file="facehair_chincurtains_alpha.tga" + skip_if_zero="true" + domain="0.03" /> - - - - + value_max="1"> + color="255,255,255,255" /> + color="255,255,255,0" /> + + + + + + name="Sideburns" + value_min="0" + value_max="1"> + domain="0.05" /> + domain="0.1" /> + domain="0.03" /> + + + + + + + + + name="head_bodypaint"> - + local_texture="head_bodypaint" /> + + + + + + + + + - + value_max="1" + value_default="1"> + + + + + - + value_max="1" + value_default="1"> + + + + + - + edit_group="colorpicker_driven" + wearable="tattoo" + name="tattoo_head_blue" + value_min="0" + value_max="1" + value_default="1"> + + + + + + + + + + + + + + + + + + domain="0" /> + name="base" + global_color="skin_color"> + tga_file="body_skingrain.tga" /> + + + tga_file="upperbody_color.tga" /> + + + + + value_max="1"> + color="0, 0, 0, 0" /> + color="0, 0, 0, 128" /> + - - - + + - - + + - - + + + + + + + + + tga_file="upperbodyfreckles_alpha.tga" + skip_if_zero="true" + domain="0.6" /> + name="upper_tattoo"> + local_texture="upper_tattoo" /> @@ -8555,11 +8832,11 @@ render_pass="bump"> @@ -8573,11 +8850,11 @@ render_pass="bump"> @@ -8590,525 +8867,318 @@ render_pass="bump"> + + + + + + + name="Sleeve Length bump" + value_min=".01" + value_max="1" + value_default=".4"> + name="upper_undershirt"> + local_texture="upper_undershirt" /> - - + value_max="1" + value_default="1"> + + - - + + - - + value_max="1" + value_default="1"> + + - - + + - - - - - - - - - - - + value_max="1" + value_default="1"> + color="0, 0, 0, 255" /> + color="0, 0, 255, 255" /> + name="Sleeve Length" + value_min=".01" + value_max="1" + value_default=".4"> + value_max="1" + value_default=".8"> + value_max="1" + value_default=".8"> + value_max="1" + value_default=".8"> + domain="0.05" /> + + + value_max="1" + value_default="0.0" + camera_distance="1.6" + camera_elevation="-.4" + camera_angle="70"> + tga_file="nailpolish_alpha.tga" + skip_if_zero="true" + domain="0.1" /> - - - - + camera_distance="1.6" + camera_elevation="-.4" + camera_angle="70"> + color="255,187,200,255" /> - - + color="194,102,127,255" /> - - + color="227,34,99,255" /> - - + color="168,41,60,255" /> - - + color="97,28,59,255" /> - - + color="234,115,93,255" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + color="114,30,46,255" /> + color="14,14,14,255" /> + name="upper_gloves bump" + render_pass="bump" + fixed_color="128,128,128,255"> + local_texture="upper_gloves" + local_texture_alpha_only="true" /> - - - - - + wearable="gloves" + edit_group="driven" + name="Glove Length bump" + value_min=".01" + value_max="1" + value_default=".8"> + - - - - - - - - - - + wearable="gloves" + edit_group="driven" + name="Glove Fingers bump" + value_min=".01" + value_max="1" + value_default="1"> + tga_file="gloves_fingers_alpha.tga" + multiply_blend="true" + domain="0.01" /> + name="upper_gloves"> + local_texture="upper_gloves" /> @@ -9122,11 +9192,11 @@ render_pass="bump"> @@ -9140,11 +9210,11 @@ render_pass="bump"> @@ -9157,267 +9227,283 @@ render_pass="bump"> - - - - - + value_default=".8"> + value_default="1"> + tga_file="gloves_fingers_alpha.tga" + multiply_blend="true" + domain="0.01" /> + name="upper_clothes_shadow"> + local_texture="upper_shirt" /> + value_default="0"> + color="0, 0, 0, 0" /> + color="0, 0, 0, 80" /> - - - - - + id="900" + group="1" + wearable="shirt" + edit_group="driven" + name="Sleeve Length Shadow" + value_min="0.02" + value_max=".87" + value_default="0.02"> + - - - - - + id="901" + group="1" + wearable="shirt" + edit_group="driven" + name="Shirt Shadow Bottom" + value_min="0.02" + value_max="1"> + + name="Collar Front Shadow Height" + value_min="0.02" + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + skip_if_zero="true" + domain="0.02" /> + name="Collar Back Shadow Height" + value_min="0.02" + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + skip_if_zero="true" + domain="0.02" /> + value_max="0.85"> - - - - - - - - - - - - - - - - - + value_max="1"> + - - - - - + value_max="1"> + + value_max="1"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + domain="0.05" /> + name="upper_clothes bump" + render_pass="bump"> + + + + + + + + + + + value_max="0.85"> + + + + + + + + + + + + + name="upper_clothes"> + local_texture="upper_shirt" /> @@ -9431,11 +9517,11 @@ render_pass="bump"> @@ -9449,11 +9535,11 @@ render_pass="bump"> @@ -9467,357 +9553,259 @@ render_pass="bump"> + value_max="0.85" + value_default=".7"> - - - - - - - - - + value_default=".8"> + + name="Collar Front Height Cloth" + value_min="0" + value_max="1" + value_default=".8"> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> + name="Collar Back Height Cloth" + value_min="0" + value_max="1" + value_default=".8"> + multiply_blend="true" + tga_file="shirt_collar_back_alpha.tga" + domain="0.05" /> + multiply_blend="false" + tga_file="shirt_sleeve_alpha.tga" + domain="0.01" /> + multiply_blend="true" + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> - - - - - - - - - - - + value_max="1"> + + multiply_blend="true" + tga_file="jacket_length_upper_alpha.tga" + domain="0.01" /> + name="upper_jacket bump" + render_pass="bump"> + tga_file="bump_shirt_wrinkles.tga" /> - - - - - - - - - - - - - - - + + + id="875" + group="1" + wearable="jacket" + name="jacket upper Wrinkles" + value_min="0" + value_max="1" + value_default="0"> + color="255, 255, 255, 0" /> + color="255, 255, 255, 255" /> - - - - - - - - - - - - + tga_file="shirt_collar_alpha.tga" + domain="0.05" /> - - - - - - - - - - - - + value_max="1"> + + name="upper_jacket"> + local_texture="upper_jacket" /> @@ -9831,11 +9819,11 @@ render_pass="bump"> @@ -9849,11 +9837,11 @@ render_pass="bump"> @@ -9867,11 +9855,53 @@ render_pass="bump"> + + + + + + + + + + + + camera_angle="30" camera_elevation=".2"> camera_elevation=".2"> + name="upper alpha" + visibility_mask="TRUE"> + local_texture="upper_alpha" /> + body_region="lower_body" + width="512" + height="512"> - + name="lower body bump base" + fixed_color = "128,128,128,255" + render_pass="bump"> - + name="base_lowerbody bump" + render_pass="bump"> + tga_file="bump_lowerbody_base.tga" + file_is_mask="FALSE" /> + + + + + name="base" + global_color="skin_color"> + tga_file="body_skingrain.tga" /> - + + + + + + + + + + + - - + name="highlight"> + tga_file="lowerbody_highlights_alpha.tga" + file_is_mask="TRUE" /> + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9974,11 +10084,11 @@ render_pass="bump"> @@ -9992,11 +10102,11 @@ render_pass="bump"> @@ -10008,124 +10118,1563 @@ render_pass="bump"> color="0, 0, 255, 255" /> + + name="lower_underpants bump" + render_pass="bump" + fixed_color="128,128,128,255"> + + + value_default=".3"> + tga_file="pants_length_alpha.tga" + domain="0.01" /> + value_default=".8"> + tga_file="pants_waist_alpha.tga" + domain="0.05" /> + + + + - + value_default="1"> + + + + + - - + value_default="1"> + + - + + + + + value_default="1"> + + + + + + + + + tga_file="pants_length_alpha.tga" + domain="0.01" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + max1="1" max2="1" min2="1" /> + + + + @@ -10560,8 +12123,8 @@ render_pass="bump"> edit_group="shape_mouth" edit_group_order="3.2" name="Lip Ratio" - label="Lip Ratio" - show_simple="true" + label="Lip Ratio" + show_simple="true" label_min="More Upper Lip" label_max="More Lower Lip" value_min="0" @@ -10584,6 +12147,21 @@ render_pass="bump"> max1="1" max2="1" min2="1" /> + + + + + @@ -10609,6 +12187,10 @@ render_pass="bump"> + + + @@ -11291,6 +12873,21 @@ render_pass="bump"> max1="1" max2="1" min2="1" /> + + + + + @@ -11501,8 +13098,23 @@ render_pass="bump"> min1=".5" max1="1" max2="1" + min2="1" /> + + + + + - - + + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - + + + + + + + + - + - + - + - + - + - + - + - + - + @@ -106,35 +111,35 @@ - + - + - + - + - + - + - + - + - + @@ -143,8 +148,8 @@ - - + + @@ -152,7 +157,7 @@ - + @@ -167,31 +172,31 @@ - + - + - + - - + + - + - + - + - - + + - + @@ -202,14 +207,14 @@ - - - + + + - + -- cgit v1.2.3 From e754cb348daa96690f1eb4914c3fe10c38df1582 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 25 Mar 2016 08:58:24 -0400 Subject: SL-276, SL-344 - skeleton and slider updates. --- indra/newview/character/avatar_lad.xml | 54 ++++++++++++++--------------- indra/newview/character/avatar_skeleton.xml | 7 ++-- 2 files changed, 30 insertions(+), 31 deletions(-) (limited to 'indra/newview/character') 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 @@ - + @@ -1261,11 +1261,11 @@ scale="0 0 0" offset="-0.0015 0 0" /> @@ -1485,22 +1485,22 @@ offset="0 0 0" /> @@ -1859,10 +1859,10 @@ - + scale = "0.10 0.1 0.0" /> @@ -1988,10 +1988,10 @@ scale = "0.0 0.00 0.0" offset = "0.0 0.001 0.0" /> - + offset = "0.0 0.007 0.0" /> @@ -2953,10 +2953,10 @@ value_max="1.5"> - + offset="0.009 0 -0.006" /> - + offset="0.00 0 0.002" /> - + offset="0 0 0" /> @@ -3012,12 +3012,12 @@ @@ -3033,12 +3033,12 @@ @@ -3054,12 +3054,12 @@ 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 @@ - + @@ -33,10 +33,10 @@ - + - + @@ -222,4 +222,3 @@ - -- cgit v1.2.3 From 11f3e485e9c55aebfdc8bf092c1b1ee0609e7ae8 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 25 Mar 2016 15:20:41 -0400 Subject: SL-276 - two more bones, corresponding to foot bones for the hind limbs --- indra/newview/character/avatar_skeleton.xml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 62cb782bf1..f08057399b 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,4 +1,4 @@ - + @@ -209,16 +209,20 @@ - - - + + + + - - - - + + + + + + - + + - + -- cgit v1.2.3 From c5abb259dddd2782558de6e09c70a9976119e665 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 28 Mar 2016 09:31:30 -0400 Subject: SL-276 - move alt eyes out of face root, match coords exactly. Return face root to 3 digit precision. --- indra/newview/character/avatar_skeleton.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index f08057399b..5266939537 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -23,7 +23,9 @@ - + + + @@ -33,10 +35,8 @@ - - -- cgit v1.2.3 From 8fecfc0c99bcbeebc9b8ffc39c38907e9d6423ce Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 28 Mar 2016 09:45:39 -0400 Subject: SL-276 - set skeleton version to 2.0 --- indra/newview/character/avatar_skeleton.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_skeleton.xml b/indra/newview/character/avatar_skeleton.xml index 5266939537..25444e248a 100755 --- a/indra/newview/character/avatar_skeleton.xml +++ b/indra/newview/character/avatar_skeleton.xml @@ -1,4 +1,4 @@ - + -- cgit v1.2.3 From 9c5d0d6152caff914a6f0159ba4f2382915d4055 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 31 Mar 2016 11:10:41 -0400 Subject: SL-363 - additional avatar_lad content, hooking head size to newer bones. --- indra/newview/character/avatar_lad.xml | 42 +++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 59ae73bf49..d72d445577 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1360,7 +1360,7 @@ id="655" group="1" name="Head Size" - label="Head Size" + label="Head Size" wearable="shape" edit_group="shape_head" label_min="Small Head" @@ -1369,6 +1369,36 @@ value_min="-.25" value_max=".10"> + + + + + + + + + + + + - + - - @@ -1403,7 +1433,7 @@ name="mFaceEyeAltRight" scale="1 1 1" offset="0 0 0" /> - + edit_group="shape_head" edit_group_order="1" name="Head Size" - label="Head Size" + label="Head Size" label_min="Small Head" label_max="Big Head" show_simple="true" -- cgit v1.2.3 From c7e886e770dd8980577206634081f888ece2df7f Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 1 Apr 2016 09:55:01 -0400 Subject: SL-344 WIP - added no-op scale field to some params that require it. --- indra/newview/character/avatar_lad.xml | 45 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index d72d445577..d0f8a8a36a 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1885,10 +1885,12 @@ scale = "0.10 0.3 0.0" /> + offset = "0 0.0025 0" + scale = "0.0 0.0 0.0" /> + offset = "0 -0.0025 0" + scale = "0.0 0.0 0.0" /> + offset = "0 0.005 0" + scale = "0.0 0.0 0.0" /> + offset = "0 -0.005 0" + scale = "0.0 0.0 0.0" /> @@ -2715,10 +2719,12 @@ + offset = "0.0 -0.0 0.0" + scale = "0.0 0.0 0.0" /> + offset = "0.0 0.0 0.0" + scale = "0.0 0.0 0.0" /> @@ -2731,10 +2737,12 @@ + offset = "-0.0149 0.001 0.016" + scale = "0.0 0.0 0.0" /> + offset = "-0.0149 -0.001 0.016" + scale = "0.0 0.0 0.0" /> @@ -2747,27 +2755,33 @@ + offset = "0.0 0.00 -0.02" + scale = "0.0 0.0 0.0" /> + offset = "0.0 0.00 0.02" + scale = "0.0 0.0 0.0" /> + offset = "0.0 0.00 0.02" + scale = "0.0 0.0 0.0" /> + offset = "0.0 0.00 0.02" + scale = "0.0 0.0 0.0" /> + offset = "0.0 0.00 0.02" + scale = "0.0 0.0 0.0" /> + offset = "0 0 0.02" + scale = "0.0 0.0 0.0" /> @@ -2782,7 +2796,8 @@ + offset = "0.0085 0.00 0" + scale = "0.0 0.0 0.0" /> -- cgit v1.2.3 From 33b12142fe40b37d0d35d8352bd1a82c43965753 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 1 Apr 2016 15:07:40 -0400 Subject: SL-344 - added missing scale to some skeleton distortion bones --- indra/newview/character/avatar_lad.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index d0f8a8a36a..13b624308f 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -771,8 +771,8 @@ - - + + @@ -813,7 +813,7 @@ name="mChest" scale="0.02 0.08 0" /> - + @@ -823,7 +823,7 @@ id="37" group="0" name="Hip Width" - label="Hip Width" + label="Hip Width" wearable="shape" edit_group="shape_legs" edit_group_order="3" -- cgit v1.2.3 From 538fac24a18cb02c406d77ae34d0a709b64daed9 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 1 Apr 2016 15:31:28 -0400 Subject: SL-344, SL-365 - avatar_lad formatting, hind limbs respond to same sliders as the legs. --- indra/newview/character/avatar_lad.xml | 101 ++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 13b624308f..dec4ef3629 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -613,6 +613,22 @@ name="mKneeRight" scale=".05 .05 .1" /> + + + + + + + + @@ -690,6 +706,22 @@ + + + + + + + + @@ -762,6 +794,22 @@ + + + + + + + + @@ -813,8 +861,15 @@ name="mChest" scale="0.02 0.08 0" /> - - + + + @@ -846,6 +901,16 @@ + + + + @@ -910,6 +975,22 @@ + + + + + + + + @@ -1799,6 +1880,22 @@ + + + + + + + + -- cgit v1.2.3 From a5b81fedc9b4d4f9020d29b1bc4bf004f3b3c4c2 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 4 Apr 2016 16:22:29 -0400 Subject: SL-344 - more slider support --- indra/newview/character/avatar_lad.xml | 288 ++++++++++++++++++++++----------- 1 file changed, 195 insertions(+), 93 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index dec4ef3629..82efe733df 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1275,32 +1275,28 @@ + scale="0.2 0 0" + offset="0 0 0" /> + offset=".01 0 0" /> + offset=".005 0 0" /> + offset=".005 0 0" /> - + offset=".005 0 0" /> + offset="0.01 0 0" /> + offset="0.01 0 0" /> + offset="0.01 0 0" /> + offset="0.005 0 0" /> - + + - + + + offset="-0.007 0 0" /> + + + + @@ -2074,6 +2082,11 @@ scale = "0.0 0.00 0.0" offset = "0.0 0.009 0.0" /> + + + + @@ -2592,24 +2610,24 @@ id="30764" group="0" name="Lip_Cleft_Deep" - value_min="-.5" + value_min="-1" value_max="1.2"> + offset = "0 0 0.002" /> + offset = "0 0 -0.001" /> + offset = "0 0 0.002" /> @@ -2647,6 +2665,11 @@ scale = "0.0 0.00 0.0" offset = "0.0 -0.003 0.0" /> + + + + - - - @@ -2895,6 +2917,12 @@ name = "mFaceJaw" offset = "0.0085 0.00 0" scale = "0.0 0.0 0.0" /> + + + @@ -2902,7 +2930,7 @@ id="30024" group="0" name="Wide_Eyes" - value_min="-1.5" + value_min="-2" value_max="2"> @@ -2948,6 +2976,25 @@ + + + + + + + + + offset="0.0025 0 -0.001" /> + + + + + + + + + + + + + + + + + + + + + + value_default="0.5"> @@ -4426,19 +4505,11 @@ + value_max="1.3"> @@ -4701,19 +4772,15 @@ + value_max="1.2"> @@ -5294,23 +5361,6 @@ - - - - - - - - + + + + + + + + + + + + + + id="30027" /> + + + + + + + + Date: Mon, 4 Apr 2016 22:11:46 -0400 Subject: SL-344 WIP - slider support for spine joints. --- indra/newview/character/avatar_lad.xml | 80 ++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 82efe733df..bac006ff59 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -593,10 +593,26 @@ name="mTorso" scale="0 0 .05" /> + + + + + + + + @@ -687,10 +703,26 @@ name="mTorso" scale="0 0 0.05" /> + + + + + + + + @@ -776,10 +808,26 @@ name="mTorso" scale="0.1 0.1 0" /> + + + + + + + + @@ -893,6 +941,14 @@ name="mPelvis" scale="0 0.1 0" /> + + + + + + + + @@ -956,10 +1020,26 @@ name="mTorso" scale="0 0 .3" /> + + + + + + + + -- cgit v1.2.3 From 535a3b3b2edd902cd814050344f5ee62cf55abd6 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 7 Apr 2016 11:50:16 -0400 Subject: SL-344 - added attachment points for hind feet --- indra/newview/character/avatar_lad.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index bac006ff59..e368e91988 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -545,6 +545,26 @@ rotation="0 0 0" visible_in_first_person="true"/> + + + + Date: Fri, 8 Apr 2016 08:50:57 -0400 Subject: SL-344, SL-276 - chin bone, slider changes. --- indra/newview/character/avatar_lad.xml | 415 +++++++++++++++++++++------- indra/newview/character/avatar_skeleton.xml | 5 +- 2 files changed, 317 insertions(+), 103 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index e368e91988..ba295fff84 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -621,18 +621,6 @@ name="mSpine4" scale="0 0 .05" /> - - - - - - @@ -731,18 +719,6 @@ name="mSpine4" scale="0 0 0.05" /> - - - - - - @@ -1174,8 +1150,17 @@ name="mFaceEyebrowOuterRight" scale="0 0 0 " offset="0 -.005 0" /> - + + + + @@ -1329,6 +1314,16 @@ scale="0 0 0" offset="0 0 -.004" /> + + + + - - @@ -1457,7 +1452,7 @@ name="mFaceTeethLower" scale="0 0 0" offset="0.007 0 0" /> - + @@ -1496,11 +1491,21 @@ scale="0 0 0 " offset=".005 0 0" /> - - + + + + + + offset=".0013 0 0" /> + offset=".0013 0 0" /> + + @@ -1726,6 +1733,11 @@ + + @@ -3006,6 +3018,48 @@ + + + + + + + + + + + + + + + + + + + name = "mFaceTeethLower" + offset = "0.008 0 0" + scale = "0.0 0.0 0.0" /> + + + + + + + + + + + + + + + @@ -3199,7 +3284,7 @@ + offset="0.006 0 0.001" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4435,38 +4579,20 @@ + value_max=".5"> + value_max="1.5"> @@ -4560,20 +4686,11 @@ + value_max="1"> @@ -4587,20 +4704,11 @@ + value_max="1"> @@ -4875,10 +4983,6 @@ id="20880" group="0" name="Eyelid_Inner_Corner_Up" - label="Inner Eye Corner" - wearable="shape" - label_min="Corner Down" - label_max="Corner Up" value_min="-1.3" value_max="1.2"> @@ -5005,21 +5109,12 @@ + value_default="0"> @@ -11697,6 +11792,31 @@ render_pass="bump"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,6 +62,7 @@ + @@ -212,7 +213,7 @@ - + -- cgit v1.2.3 From 17152cc7ab5e354da75e23b310972310066f7aad Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 11 Apr 2016 11:45:28 -0400 Subject: SL-344 - additional slider tweaks --- indra/newview/character/avatar_lad.xml | 326 +++++++++++++++++++++++++++------ 1 file changed, 265 insertions(+), 61 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index ba295fff84..61f06c6cf9 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1370,7 +1370,7 @@ + + + + @@ -2170,7 +2180,7 @@ + scale = "0.10 0.85 0.0" /> + offset = "0.0 0.0008 0.0" /> + offset = "0.0 0.0008 0.0" /> + offset = "0.0 0.004 0.0" /> + + + + + + @@ -3022,38 +3047,38 @@ id="30760" group="0" name="Jaw_Angle" - value_min="-1.2" + value_min="-2" value_max="2" value_default="0"> @@ -3080,6 +3105,21 @@ + + + + + + + - + - + + + + + @@ -3226,6 +3276,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + offset="0.007 0 0.001" /> + offset="0.0 0.0038 0.0" /> + offset="0.0 -0.0038 0.0" /> @@ -3455,12 +3584,12 @@ + offset="0.002 0 0.0015" /> + offset="0.002 0 0.0015" /> @@ -3485,8 +3614,28 @@ - - + + + + + + + + + + + + name="mFaceCheekUpperLeft" + scale="0 0 0" + offset="0 0 0.02" /> + name="mFaceCheekUpperRight" + scale="0 0 0" + offset="0 0 0.02" /> @@ -3519,7 +3668,7 @@ + offset="0.001 0 -0.0015" /> + offset="0.001 0 -0.002" /> + offset="0.001 0 -0.002" /> @@ -4561,20 +4710,11 @@ + value_max="1"> @@ -4740,19 +4880,11 @@ + value_max="1.5"> @@ -11841,6 +11973,29 @@ render_pass="bump"> + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13497,6 +13697,10 @@ render_pass="bump"> + + + @@ -13768,13 +13972,13 @@ render_pass="bump"> edit_group="shape_eyes" edit_group_order="1" name="Eye Size" - label="Eye Size" + label="Eye Size" label_min="Beady Eyes" label_max="Anime Eyes" value_min="0" value_max="1" value_default=".5" - show_simple="true" + show_simple="true" camera_elevation=".1" camera_distance=".35"> -- cgit v1.2.3 From 67eb559dc7c1be049898dd4216fbbd884496448d Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 11 Apr 2016 21:19:22 -0400 Subject: SL-344 - additional sliders, additional avatar_lad validation in skel_tool.py --- indra/newview/character/avatar_lad.xml | 236 ++++++++++++++++++++++++++++++++- 1 file changed, 229 insertions(+), 7 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 61f06c6cf9..8c3a303996 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3042,6 +3042,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + max1="-1.3" max2="-1.3" min2="1" - id="30017" /> + id="40017" /> + id="40185" /> + id="41629" /> + id="42629" /> + id="40007" /> + id="40647" /> -- cgit v1.2.3 From 31ea725b04f86856f051068020f2e710ce93cf59 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 12 Apr 2016 13:20:37 -0400 Subject: SL-344 - egg head, egg stretch, head length bug fixes --- indra/newview/character/avatar_lad.xml | 194 ++++++++++++++++++++++++++++++++- 1 file changed, 188 insertions(+), 6 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 8c3a303996..6701645a39 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1446,7 +1446,7 @@ + offset="0.015 0 0" /> + offset="0 -0.004 0.0014" /> + + + + + + + + offset="0 0.004 0.0014" /> + + + + + + + + + + + + + + + + + + + + + + + + + offset="0 -0.004 0.0014" /> + + + + + + + + offset="0 0.004 0.0014" /> + + + + + + + + + + + + + + + + + + + + + + + + - + Date: Wed, 27 Apr 2016 17:19:09 -0400 Subject: SL-344 - fixed a problem in avatar_lad with some params in wrong group, added diagnostics to make this easier to detect. --- indra/newview/character/avatar_lad.xml | 166 ++++++++++++++++----------------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 6701645a39..261d495af9 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -2101,7 +2101,7 @@ @@ -2128,7 +2128,7 @@ @@ -2146,7 +2146,7 @@ @@ -2194,7 +2194,7 @@ @@ -2279,7 +2279,7 @@ @@ -2370,7 +2370,7 @@ @@ -2421,7 +2421,7 @@ @@ -2574,7 +2574,7 @@ @@ -2745,7 +2745,7 @@ @@ -2771,7 +2771,7 @@ @@ -2792,7 +2792,7 @@ @@ -2874,7 +2874,7 @@ @@ -2955,7 +2955,7 @@ @@ -2973,7 +2973,7 @@ @@ -2992,7 +2992,7 @@ @@ -3010,7 +3010,7 @@ @@ -3044,7 +3044,7 @@ @@ -3079,7 +3079,7 @@ @@ -3141,7 +3141,7 @@ @@ -3156,7 +3156,7 @@ @@ -3171,7 +3171,7 @@ @@ -3186,7 +3186,7 @@ @@ -3202,7 +3202,7 @@ @@ -3233,7 +3233,7 @@ @@ -3252,7 +3252,7 @@ @@ -3271,7 +3271,7 @@ @@ -3302,7 +3302,7 @@ @@ -3328,7 +3328,7 @@ @@ -3354,7 +3354,7 @@ @@ -3737,7 +3737,7 @@ @@ -3783,7 +3783,7 @@ @@ -3829,7 +3829,7 @@ @@ -3850,7 +3850,7 @@ @@ -3871,7 +3871,7 @@ @@ -3887,7 +3887,7 @@ @@ -3927,7 +3927,7 @@ @@ -3952,7 +3952,7 @@ @@ -3979,7 +3979,7 @@ @@ -4000,7 +4000,7 @@ @@ -4021,7 +4021,7 @@ @@ -4042,7 +4042,7 @@ @@ -4063,7 +4063,7 @@ @@ -4915,7 +4915,7 @@ --> @@ -4924,7 +4924,7 @@ @@ -4933,7 +4933,7 @@ @@ -4942,7 +4942,7 @@ @@ -4951,7 +4951,7 @@ @@ -4960,7 +4960,7 @@ @@ -4969,7 +4969,7 @@ @@ -4978,7 +4978,7 @@ @@ -4987,7 +4987,7 @@ @@ -4996,7 +4996,7 @@ @@ -5005,7 +5005,7 @@ @@ -5024,7 +5024,7 @@ @@ -5033,7 +5033,7 @@ @@ -5042,7 +5042,7 @@ @@ -5051,7 +5051,7 @@ @@ -5060,7 +5060,7 @@ @@ -5069,7 +5069,7 @@ @@ -5078,7 +5078,7 @@ @@ -5087,7 +5087,7 @@ @@ -5124,7 +5124,7 @@ @@ -5133,7 +5133,7 @@ @@ -5142,7 +5142,7 @@ @@ -5151,7 +5151,7 @@ @@ -5160,7 +5160,7 @@ @@ -5204,7 +5204,7 @@ @@ -5231,7 +5231,7 @@ @@ -5240,7 +5240,7 @@ @@ -5249,7 +5249,7 @@ @@ -5258,7 +5258,7 @@ @@ -5285,7 +5285,7 @@ @@ -5305,7 +5305,7 @@ @@ -5517,7 +5517,7 @@ @@ -5646,7 +5646,7 @@ Date: Wed, 4 May 2016 08:28:49 -0400 Subject: MAINT-1211 - fix for female torso muscles slider (via Adeon Writer) --- indra/newview/character/avatar_lad.xml | 48 ++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 261d495af9..ba6ccbc30a 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -6528,7 +6528,51 @@ group="1" name="Muscular_Torso" label="Torso Muscles" - show_simple="true" + sex="male" + show_simple="true" + wearable="shape" + edit_group="shape_torso" + label_min="Regular" + label_max="Muscular" + value_min="0" + value_max="1.4" + camera_elevation=".3" + camera_distance="1.2"> + + + + + + + + + + + min2=".5" /> Date: Wed, 4 May 2016 08:34:43 -0400 Subject: SL-373 - package slider support --- indra/newview/character/avatar_lad.xml | 55 ++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 12 deletions(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index ba6ccbc30a..53faf1149b 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -4092,7 +4092,22 @@ + + + + + + @@ -7685,21 +7700,12 @@ + value_max="2"> @@ -14732,6 +14738,31 @@ render_pass="bump"> + + + + + + + + Date: Tue, 17 May 2016 16:06:27 -0400 Subject: SL-315 - resetSkeleton() fixes, mostly to get better behavior with non-self avs --- indra/newview/character/avatar_lad.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/character') diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index 53faf1149b..fcb4709c6c 100755 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -3204,7 +3204,7 @@ id="30024" group="1" name="Wide_Eyes" - value_min="-2" + value_min="-1.5" value_max="2"> -- cgit v1.2.3