diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 21:26:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 21:26:55 -0400 |
| commit | f48fe44684a535ed2eefc64c134551ce72e9ecf4 (patch) | |
| tree | 601bfe8f31052620321811582244d12a29d6d7a1 /indra/llprimitive/lldaeloader.cpp | |
| parent | 2fdca60e61543309d43f5fa99ba2b40f209aec20 (diff) | |
| parent | a50a0e1277386de3456f478127f774fa01cdb578 (diff) | |
Merge pull request #4306 from secondlife/geenz/develop-to-gltf-mesh
Merge develop 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 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) |