diff options
author | Aura Linden <aura@lindenlab.com> | 2015-11-11 13:44:51 -0800 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2015-11-11 13:44:51 -0800 |
commit | 146919fa764bed09bfa5e27bc30d02ce2afb6188 (patch) | |
tree | b073b1a0e140a7fff67ca309acc6dcbc1f477267 /indra/llprimitive/llmodelloader.h | |
parent | 07496b015b01899b21960b60d2f3af7bf317c349 (diff) |
animations and meshes will recognize all joint names in joint_aliases.xml
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
-rw-r--r-- | indra/llprimitive/llmodelloader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index 894de2c76f..20c3aee649 100644 --- a/indra/llprimitive/llmodelloader.h +++ b/indra/llprimitive/llmodelloader.h @@ -128,7 +128,8 @@ public: void* opaque_userdata, JointTransformMap& jointTransformMap, JointNameSet& jointsFromNodes, - JointNameSet& legalJointNames); + JointNameSet& legalJointNames, + std::string jointAliasFilename); virtual ~LLModelLoader() ; virtual void setNoNormalize() { mNoNormalize = true; } |