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/newview/llmodelpreview.cpp | |
parent | fa7a4a38d8e66121116d91d947c4ec807822912e (diff) | |
parent | bca9ba9b7940f9e32fe9dd25fb64fa4f2fb407db (diff) |
Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import
Diffstat (limited to 'indra/newview/llmodelpreview.cpp')
-rw-r--r-- | indra/newview/llmodelpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index d8373ed0cb..d8b1c3482a 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -781,7 +781,7 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable mLODFile[lod] = filename; - std::map<std::string, std::string> joint_alias_map; + std::map<std::string, std::string, std::less<>> joint_alias_map; getJointAliases(joint_alias_map); LLHandle<LLModelPreview> preview_handle = getHandle(); |