diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-06-28 16:28:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-06-28 16:28:05 -0400 |
commit | bca9ba9b7940f9e32fe9dd25fb64fa4f2fb407db (patch) | |
tree | 4a1c6709d761210bec4e4eb89a6e2639d5658de1 /indra/llprimitive/llmodelloader.h | |
parent | 06a9e45fa371365f56549fe1c1628bf7cf8589d1 (diff) | |
parent | 75db5e8b6b911e312ebdb9bc10a55d048a70e0be (diff) |
Merge pull request #4310 from Ansariel/gltf-import-revert-getjoint
Revert "Fix LLCharacter base class constness."
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
-rw-r--r-- | indra/llprimitive/llmodelloader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index 7c808dcae0..caffa34676 100644 --- a/indra/llprimitive/llmodelloader.h +++ b/indra/llprimitive/llmodelloader.h @@ -36,7 +36,7 @@ class LLJoint; typedef std::map<std::string, LLMatrix4> JointTransformMap; typedef std::map<std::string, LLMatrix4>::iterator JointTransformMapIt; -typedef std::map<std::string, std::string> JointMap; +typedef std::map<std::string, std::string, std::less<>> JointMap; typedef std::deque<std::string> JointNameSet; const S32 SLM_SUPPORTED_VERSION = 3; |