diff options
| author | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-08 06:15:27 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <andreylproductengine@lindenlab.com> | 2015-07-08 06:15:27 +0300 |
| commit | f153aa3daf2e70b6da8c113b55afff10af1f5fae (patch) | |
| tree | 6009e19a1d2271d26bd4c4efa98f773c30a1e2b7 | |
| parent | 7ae4837b520a79960186ab074c9a73913f15ea65 (diff) | |
MAINT-5371 FIXED Undesired space added to SL and LL domains sent in chat
| -rwxr-xr-x | indra/llui/llurlregistry.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 2085505947..5ad05a1c86 100755 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -218,6 +218,10 @@ 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. See MAINT-5371. + if (match_start > 0 && text.substr(match_start - 1, 1) == "@") + return false; + // fill in the LLUrlMatch object and return it std::string url = text.substr(match_start, match_end - match_start + 1); |