Merged in graham_linden/viewer-eep-fixes (pull request #273)

SL-10478, SL-10486, SL-10501, SL-10415, SL-10487

1 files changed, 4 insertions, 7 deletions

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 768db047a4..2760ebd1df 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -268,12 +268,9 @@ 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;
+
+	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);
 #endif
 }