diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-08 12:44:29 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-08 12:44:29 -0800 |
| commit | 5c5b625892a86dfa467225c059f7ef1188ba46ca (patch) | |
| tree | 65773de98719a3e7e85f9ba4a76371f3a90ce444 /indra/newview/llweb.cpp | |
| parent | 9f2a0d2a082495ce878f0eb0d7348b181939d348 (diff) | |
| parent | c909e496fd1a0710e5349441ef4e3cae5ff98de6 (diff) | |
Merge SL-10501 fix
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rw-r--r-- | indra/newview/llweb.cpp | 11 |
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 } |
