diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-23 16:16:10 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2015-10-23 16:16:10 +0300 |
| commit | dd7dc1b4cae00ecd78e8ecfd5bb25aa861503596 (patch) | |
| tree | 3f97edcd5fd0bba2bb492384102dd7419ffa1b09 | |
| parent | dc2cb70e81ce3ce7fbf6b50c07193a5be09d1042 (diff) | |
| parent | 966e9efd569b70c13755d8fe163c9a929a9394cb (diff) | |
Merged lindenlab/viewer-lion into default
| -rwxr-xr-x | indra/llui/llurlregistry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 4f389a0c12..23c6d5a954 100755 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -215,7 +215,6 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL // did we find a match? if so, return its details in the match object if (match_entry) { - // Skip if link is an email with an empty username (starting with @). See MAINT-5371. if (match_start > 0 && text.substr(match_start - 1, 1) == "@") return false; @@ -224,7 +223,8 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL std::string url = text.substr(match_start, match_end - match_start + 1); LLUrlEntryBase *stripped_entry = NULL; - if(match_entry != mUrlEntryNoLink && LLStringUtil::containsNonprintable(url)) + if((match_entry != mUrlEntryNoLink) && (match_entry != mUrlEntryHTTPLabel) && (match_entry !=mUrlEntrySLLabel) + && LLStringUtil::containsNonprintable(url)) { LLStringUtil::stripNonprintable(url); |