summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2019-02-11 16:51:06 -0800
committerRider Linden <rider@lindenlab.com>2019-02-11 16:51:06 -0800
commitd5aba3988291a2929f4b894d91250e75ffde3d8e (patch)
treed6360cee0c52097840412c978e039bfd69eced70 /indra/newview/llweb.cpp
parent2a740309d01ca2ab80fd054ea8d8a79fb7ebbbe0 (diff)
parent5433ed60ac93c6ccc7692ad43d579a83ab544f31 (diff)
Merge
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r--indra/newview/llweb.cpp11
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
}