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/llmodelloader.h | |
parent | fa7a4a38d8e66121116d91d947c4ec807822912e (diff) | |
parent | bca9ba9b7940f9e32fe9dd25fb64fa4f2fb407db (diff) |
Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import
Diffstat (limited to 'indra/llprimitive/llmodelloader.h')
-rw-r--r-- | indra/llprimitive/llmodelloader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h index 73ec0ed1f4..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; @@ -198,6 +198,7 @@ public: const LLSD logOut() const { return mWarningsArray; } void clearLog() { mWarningsArray.clear(); } + void dumpDebugData(); protected: |