diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-03 15:49:55 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-03 15:49:55 -0500 |
commit | 826f3aa57aa0679aeb895a7145f7b406a8a1ff4e (patch) | |
tree | 1df0a21442f14b076ed7ad2b446d6ac7f4885edd /indra/newview/character/avatar_lad.xml | |
parent | e87975284e2b50c81d95bbb9672678ae262288be (diff) | |
parent | 90d92647f417601814c3e7fffac357435f485c79 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/character/avatar_lad.xml')
-rw-r--r-- | indra/newview/character/avatar_lad.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml index c43ba27984..10c197d09e 100644 --- a/indra/newview/character/avatar_lad.xml +++ b/indra/newview/character/avatar_lad.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="US-ASCII" standalone="yes"?> <linden_avatar - version="1.0" wearable_definition_version="23"> + version="1.0" wearable_definition_version="24"> <!-- The wearable_definition_version is checked during asset upload. --> <!-- If you increment it, check indra/lib/python/indra/assetutil.py. --> <skeleton @@ -8985,7 +8985,7 @@ render_pass="bump"> id="1017" /> <driven - id="1033" /> + id="1035" /> <driven id="914" |