diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-12-07 21:27:12 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-18 23:25:51 +0300 |
| commit | f7edcab9c3187a2dc797db614ba0302ed7eed578 (patch) | |
| tree | 7fec7cf780e599c481beff24f276ef0417783e32 /indra/llappearance | |
| parent | d35f4536cc667ea1c2c0ade08c697d2b9e6f269c (diff) | |
SL-288, SL-10163 - allow joint aliases, but otherwise reject upload of animations containing invalid joint names
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
Diffstat (limited to 'indra/llappearance')
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 90dfa04f28..6c77a9242e 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -927,6 +927,9 @@ BOOL LLAvatarAppearance::loadAvatar() return FALSE; } + // initialize mJointAliasMap + getJointAliases(); + // avatar_lad.xml : <skeleton> if( !loadSkeletonNode() ) { @@ -1047,7 +1050,6 @@ BOOL LLAvatarAppearance::loadAvatar() return FALSE; } } - return TRUE; } |