diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:36:52 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:36:52 -0700 |
| commit | fdbf73d95392e2dc64e3193a9cc3ea4c8260b8dc (patch) | |
| tree | 445d8bd89ab9541db02d04e253869a96cdcd03d6 /indra/llcommon | |
| parent | 0f6ef1643e6149a40aa605ad8f44d89df843bd80 (diff) | |
| parent | 08c483c2693153f49cfacb8cf517cf6067f53205 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llstring.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index bbb6aa2c20..5df0f8702d 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -758,7 +758,7 @@ std::string utf8str_showBytesUTF8(const std::string& utf8str) } // Search for any emoji symbol, return true if found -bool wstring_has_emoji(const LLWString& wstr) +bool wstring_has_emoji(LLWStringView wstr) { for (const llwchar& wch : wstr) { diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 61d698687a..123f4184b5 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -448,6 +448,7 @@ template<class T> std::string LLStringUtilBase<T>::sLocale; typedef LLStringUtilBase<char> LLStringUtil; typedef LLStringUtilBase<llwchar> LLWStringUtil; typedef std::basic_string<llwchar> LLWString; +typedef std::basic_string_view<llwchar> LLWStringView; //@ Use this where we want to disallow input in the form of "foo" // This is used to catch places where english text is embedded in the code @@ -749,7 +750,7 @@ LL_COMMON_API llwchar utf8str_to_wchar(const std::string& utf8str, size_t offset LL_COMMON_API std::string utf8str_showBytesUTF8(const std::string& utf8str); -LL_COMMON_API bool wstring_has_emoji(const LLWString& wstr); +LL_COMMON_API bool wstring_has_emoji(LLWStringView wstr); LL_COMMON_API bool wstring_remove_emojis(LLWString& wstr); |