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/lldaeloader.cpp | |
| parent | 07496b015b01899b21960b60d2f3af7bf317c349 (diff) | |
animations and meshes will recognize all joint names in joint_aliases.xml
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index c50db824af..63457512ff 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -811,6 +811,7 @@ LLDAELoader::LLDAELoader( JointTransformMap& jointTransformMap, JointNameSet& jointsFromNodes, JointNameSet& legalJointNames, + std::string jointAliasesFilename, U32 modelLimit) : LLModelLoader( filename, @@ -822,7 +823,8 @@ LLDAELoader::LLDAELoader( opaque_userdata, jointTransformMap, jointsFromNodes, - legalJointNames), + legalJointNames, + jointAliasesFilename), mGeneratedModelLimit(modelLimit) { } |