diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-12-06 21:58:14 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-18 23:30:02 +0300 |
| commit | 307db06310d6d3dc5a38da5543d0f074266fb12a (patch) | |
| tree | 182de4acbaaa3603fd638622a2c9fc18760e500c /indra/newview | |
| parent | 4413f9be879c14328988ce4d285c1dfa263db027 (diff) | |
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
# Conflicts:
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvoavatar.cpp
# scripts/content_tools/anim_tool.py
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index 7c6721cad9..14fae8d035 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -50,6 +50,10 @@ #include "llpreviewnotecard.h" #include "llpreviewgesture.h" #include "llcoproceduremanager.h" +#include "llthread.h" +#include "llkeyframemotion.h" +#include "lldatapacker.h" +#include "llvoavatarself.h" void dialog_refresh_all(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index b1f04601fd..8c8025e352 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6145,7 +6145,11 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name ) LLJoint* jointp = NULL; if (iter == mJointMap.end() || iter->second == NULL) - { + { //search for joint and cache found joint in lookup table + if (mJointAliasMap.empty()) + { + getJointAliases(); + } joint_alias_map_t::const_iterator alias_iter = mJointAliasMap.find(name); std::string canonical_name; if (alias_iter != mJointAliasMap.end()) |