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/llui/llurlregistry.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/llui/llurlregistry.cpp')
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 321a0ec5b9..bfcd970529 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -26,10 +26,10 @@ */ #include "linden_common.h" +#include "llregex.h" #include "llurlregistry.h" #include "lluriparser.h" -#include <boost/regex.hpp> // default dummy callback that ignores any label updates from the server void LLUrlRegistryNullCallback(const std::string &url, const std::string &label, const std::string& icon) @@ -108,15 +108,7 @@ static bool matchRegex(const char *text, boost::regex regex, U32 &start, U32 &en boost::cmatch result; bool found; - // regex_search can potentially throw an exception, so check for it - try - { - found = boost::regex_search(text, result, regex); - } - catch (std::runtime_error &) - { - return false; - } + found = ll_regex_search(text, result, regex); if (! found) { |