Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-popup

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index b816225b07..768db047a4 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -268,6 +268,12 @@ bool LLWeb::useExternalBrowser(const std::string &url)
 		boost::match_results<std::string::const_iterator> matches;
 		return !(boost::regex_search(uri_string, matches, pattern));
 	}
+	else
+	{
+		boost::regex pattern = boost::regex("^mailto:", boost::regex::perl | boost::regex::icase);
+		boost::match_results<std::string::const_iterator> matches;
+		return boost::regex_search(url, matches, pattern);
+	}
 	return false;
 #endif
 }