Merge remote-tracking branch 'origin/develop' into develop-linux

1 files changed, 4 insertions, 5 deletions

diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp
index cd062b23b8..90ba6f1ecc 100644
--- a/indra/llui/lluicolortable.cpp
+++ b/indra/llui/lluicolortable.cpp
@@ -198,8 +198,8 @@ LLUIColor LLUIColorTable::getColor(std::string_view name, const LLColor4& defaul
 // update user color, loaded colors are parsed on initialization
 void LLUIColorTable::setColor(std::string_view name, const LLColor4& color)
 {
-    auto it = mUserSetColors.lower_bound(name);
-    if(it != mUserSetColors.end() && !(mUserSetColors.key_comp()(name, it->first)))
+    auto it = mUserSetColors.find(name);
+    if(it != mUserSetColors.end())
     {
         it->second = color;
     }
@@ -330,9 +330,8 @@ void LLUIColorTable::clearTable(string_color_map_t& table)
 // if the color already exists it changes the color
 void LLUIColorTable::setColor(std::string_view name, const LLColor4& color, string_color_map_t& table)
 {
-    string_color_map_t::iterator it = table.lower_bound(name);
-    if(it != table.end()
-    && !(table.key_comp()(name, it->first)))
+    string_color_map_t::iterator it = table.find(name);
+    if(it != table.end())
     {
         it->second = color;
     }