diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
| commit | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (patch) | |
| tree | 8e236beed1a7b69d97000f58d9b0ec2294488850 /indra/newview/llinventoryfilter.cpp | |
| parent | 725fc6fa85cf17bd3c52e7e8a9ce75b3ee97b647 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-534
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 411311bbea..3b5ba24b9f 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -36,13 +36,14 @@ #include "llinventorymodelbackgroundfetch.h" #include "llinventoryfunctions.h" #include "llmarketplacefunctions.h" +#include "llregex.h" #include "llviewercontrol.h" #include "llfolderview.h" #include "llinventorybridge.h" #include "llviewerfoldertype.h" #include "llradiogroup.h" #include "llstartup.h" -#include <boost/regex.hpp> + // linden library includes #include "llclipboard.h" #include "lltrans.h" @@ -879,7 +880,7 @@ void LLInventoryFilter::setFilterSubString(const std::string& string) boost::regex mPattern = boost::regex("\"\\s*([^<]*)?\\s*\"", boost::regex::perl | boost::regex::icase); boost::match_results<std::string::const_iterator> matches; - mExactToken = (boost::regex_match(filter_sub_string_new, matches, mPattern) && matches[1].matched) + mExactToken = (ll_regex_match(filter_sub_string_new, matches, mPattern) && matches[1].matched) ? matches[1] : LLStringUtil::null; if ((old_token.empty() && !mExactToken.empty()) |