From 3b328a3880972141311d38500e94f7b1bc64786c Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 15 Nov 2016 13:00:47 +0200
Subject: [PATCH] MAINT-6929 [Contribution] E-mail links are not parsed
 correctly when top level domain is over 6 characters.

---
 doc/contributions.txt     | 1 +
 indra/llui/llurlentry.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2ea1db7e66a..b93117e37e3 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -209,6 +209,7 @@ Ansariel Hiller
 	MAINT-6917
 	STORM-2140
 	MAINT-6912
+	MAINT-6929
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 27a2456debb..b5a31f51180 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -1377,7 +1377,7 @@ std::string LLUrlEntryIcon::getIcon(const std::string &url)
 LLUrlEntryEmail::LLUrlEntryEmail()
 	: LLUrlEntryBase()
 {
-	mPattern = boost::regex("(mailto:)?[\\w\\.\\-]+@[\\w\\.\\-]+\\.[a-z]{2,6}",
+	mPattern = boost::regex("(mailto:)?[\\w\\.\\-]+@[\\w\\.\\-]+\\.[a-z]{2,63}",
 							boost::regex::perl | boost::regex::icase);
 	mMenuName = "menu_url_email.xml";
 	mTooltip = LLTrans::getString("TooltipEmail");
-- 
GitLab