diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-27 22:41:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 22:41:44 -0400 |
| commit | 7a06abed9b8f542cdb7f8f7b015013ddd436f929 (patch) | |
| tree | 9e473b5ecbd873062b29d91ee94cc06453e12dd7 /indra/llprimitive/lldaeloader.cpp | |
| parent | f48fe44684a535ed2eefc64c134551ce72e9ecf4 (diff) | |
| parent | b0c951ffe348f478f27a85720cc7aeffea32fe73 (diff) | |
Merge pull request #4307 from secondlife/revert-4306-geenz/develop-to-gltf-mesh
Revert "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 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) |