diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-07-17 11:23:10 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-07-17 11:23:51 +0300 |
| commit | 6e186befad1eafd091a38c9e4d6b58cc09926e57 (patch) | |
| tree | c128d6fcbd9482dbe31092ac34bb9d31f69f6255 /indra/llprimitive/lldaeloader.cpp | |
| parent | 58420b8e63d2f5ac6a0ebe858a34061b16c9c16b (diff) | |
Reapply "Merge develop into glTF mesh import"
To simplify merging into mesh import branch
This reverts commit b0c951ffe348f478f27a85720cc7aeffea32fe73.
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index eadb052b38..0759447902 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -880,7 +880,7 @@ LLDAELoader::LLDAELoader( void* opaque_userdata, JointTransformMap& jointTransformMap, JointNameSet& jointsFromNodes, - std::map<std::string, std::string, std::less<>>& jointAliasMap, + std::map<std::string, std::string>& jointAliasMap, U32 maxJointsPerMesh, U32 modelLimit, bool preprocess) |