From 75db5e8b6b911e312ebdb9bc10a55d048a70e0be Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 28 Jun 2025 19:31:02 +0200
Subject: Revert "Fix LLCharacter base class constness." and restore
 improvements from 10a324a1034c177b95545ac7ffaa6aa6abed65ff instead

---
 indra/llcharacter/llbvhloader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/llcharacter/llbvhloader.cpp')

diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index 9dace08e6f..581e9f62d5 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -131,7 +131,7 @@ LLQuaternion::Order bvhStringToOrder( char *str )
 // LLBVHLoader()
 //-----------------------------------------------------------------------------
 
-LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string>& joint_alias_map )
+LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string, std::less<>>& joint_alias_map )
 {
     reset();
     errorLine = 0;
@@ -156,9 +156,9 @@ LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &error
     }
 
     // Recognize all names we've been told are legal.
-    for (std::map<std::string, std::string>::value_type& alias_pair : joint_alias_map)
+    for (const auto& [alias, joint] : joint_alias_map)
     {
-        makeTranslation( alias_pair.first , alias_pair.second );
+        makeTranslation(alias, joint);
     }
 
     char error_text[128];       /* Flawfinder: ignore */
-- 
cgit v1.2.3