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

Conflicts: indra/newview/lldynamictexture.cpp
2012-03-31 01:54:53 +02:00
parent 29e308b5ca e7bcf1e9ec
commit 7774fe7f04
17 changed files with 752 additions and 757 deletions
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -396,8 +396,8 @@

    <attachment_point
       id="39"
-       group="9"
-       pie_slice="1"
+       group="6"
+       pie_slice="0"
       name="Neck"
       joint="mNeck"
       position="0 0 0"
@@ -406,8 +406,8 @@
  	
    <attachment_point
       id="40"
-       group="9"
-       pie_slice="2"
+       group="6"
+       pie_slice="4"
       name="Root"
       joint="mRoot"
       position="0 0 0"