Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.

1 files changed, 7 insertions, 4 deletions

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