summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2023-07-18 10:51:51 -0700
committerCallum Prentice <callum@lindenlab.com>2023-07-18 10:51:51 -0700
commitc5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch)
treec2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/llmessage
parent1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff)
parentec4135da63a3f3877222fba4ecb59b15650371fe (diff)
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llcachename.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 66bd85f4e6..a2e85cf6c2 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -552,7 +552,9 @@ std::string LLCacheName::buildUsername(const std::string& full_name)
// if the input wasn't a correctly formatted legacy name, just return it
// cleaned up from a potential terminal "Resident"
- return cleanFullName(full_name);
+ std::string clean_name = cleanFullName(full_name);
+ LLStringUtil::toLower(clean_name);
+ return clean_name;
}
//static