diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-04 09:54:07 -0500 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-04 09:54:07 -0500 |
commit | 8066f4868584ebbef6512006ffc07b158f382799 (patch) | |
tree | 04b77c72f11d6b5cfea775880eb2af0f610f2408 /indra/newview/character/avatar_lad.xml | |
parent | c10a40e54ea32825f46f91525814c19f1cb818e6 (diff) | |
parent | 826f3aa57aa0679aeb895a7145f7b406a8a1ff4e (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" |