summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcachename.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-11-09 10:05:17 +0000
committerTofu Buzzard <no-email>2010-11-09 10:05:17 +0000
commitcaa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch)
tree682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/llmessage/llcachename.cpp
parent179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff)
parentb657516f72f016a918e0ff627105dd380a94394c (diff)
merge up from v-d
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
-rw-r--r--indra/llmessage/llcachename.cpp19
1 files changed, 14 insertions, 5 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 522b99bc02..4ab6bd2438 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -556,19 +556,28 @@ std::string LLCacheName::buildUsername(const std::string& full_name)
//static
std::string LLCacheName::buildLegacyName(const std::string& complete_name)
{
- boost::regex complete_name_regex("(.+)( \\()([A-Za-z]+)(.[A-Za-z]+)*(\\))");
+ // regexp doesn't play nice with unicode, chop off the display name
+ S32 open_paren = complete_name.rfind(" (");
+
+ if (open_paren == std::string::npos)
+ {
+ return complete_name;
+ }
+
+ std::string username = complete_name.substr(open_paren);
+ boost::regex complete_name_regex("( \\()([a-z0-9]+)(.[a-z]+)*(\\))");
boost::match_results<std::string::const_iterator> name_results;
- if (!boost::regex_match(complete_name, name_results, complete_name_regex)) return complete_name;
+ if (!boost::regex_match(username, name_results, complete_name_regex)) return complete_name;
- std::string legacy_name = name_results[3];
+ std::string legacy_name = name_results[2];
// capitalize the first letter
std::string cap_letter = legacy_name.substr(0, 1);
LLStringUtil::toUpper(cap_letter);
legacy_name = cap_letter + legacy_name.substr(1);
- if (name_results[4].matched)
+ if (name_results[3].matched)
{
- std::string last_name = name_results[4];
+ std::string last_name = name_results[3];
std::string cap_letter = last_name.substr(1, 1);
LLStringUtil::toUpper(cap_letter);
last_name = cap_letter + last_name.substr(2);