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/newview/llmodelpreview.cpp | |
| 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/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 fc0a3ec58f..6843f7375d 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(); |