diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:25:03 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-07-03 21:25:03 +0800 |
commit | 9dee269eacd32c48627d3fcc243104a56f021bbc (patch) | |
tree | b6418c111051e1ccebf0553e7ff667f917ea4c8d /indra/llprimitive/lldaeloader.cpp | |
parent | fa7a4a38d8e66121116d91d947c4ec807822912e (diff) | |
parent | bca9ba9b7940f9e32fe9dd25fb64fa4f2fb407db (diff) |
Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import
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 0759447902..eadb052b38 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>& jointAliasMap, + std::map<std::string, std::string, std::less<>>& jointAliasMap, U32 maxJointsPerMesh, U32 modelLimit, bool preprocess) |