diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:16:35 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:18:26 +0300 |
commit | b18f328c08a0af7032c24843cf1d045eea73ad33 (patch) | |
tree | 9db8549ad49b40bc100199bc7a0004ab1a7ce235 /indra/newview/llweb.cpp | |
parent | b12dd38c57fd9b047382e6e2d80b26f36888eb39 (diff) | |
parent | f949415ad6d83c7c7cab282b45b1a639196b2090 (diff) |
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r-- | indra/newview/llweb.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index d019b400e8..b8f1ec35f6 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -38,6 +38,7 @@ #include "llfloaterreg.h" #include "lllogininstance.h" #include "llparcel.h" +#include "llregex.h" #include "llsd.h" #include "llui.h" #include "lluri.h" @@ -51,8 +52,6 @@ #include "lluriparser.h" #include "uriparser/Uri.h" -#include <boost/regex.hpp> - bool on_load_url_external_response(const LLSD& notification, const LLSD& response, bool async ); @@ -239,13 +238,13 @@ bool LLWeb::useExternalBrowser(const std::string &url) boost::regex pattern = boost::regex("\\b(lindenlab.com|secondlife.com|secondlife.io)$", boost::regex::perl|boost::regex::icase); boost::match_results<std::string::const_iterator> matches; - return !(boost::regex_search(uri_string, matches, pattern)); + return !(ll_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 ll_regex_search(url, matches, pattern); } #endif } |