summaryrefslogtreecommitdiff
path: root/indra/llfilesystem/lldiriterator.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-09-10 15:53:59 -0400
committerGitHub <noreply@github.com>2025-09-10 15:53:59 -0400
commit5b97823db6f7cec6569ef893499cf48f4a889e67 (patch)
tree79f368f096ba2c72a98627671c713a0a8abf332f /indra/llfilesystem/lldiriterator.cpp
parent175400230869963df7a3f126122ace14456c56cb (diff)
parentdd1113ba2b62b24378e5b8ecfee0093474527c5a (diff)
Merge pull request #4636 from secondlife/project/mac_universal
Apple Silicon Support
Diffstat (limited to 'indra/llfilesystem/lldiriterator.cpp')
-rw-r--r--indra/llfilesystem/lldiriterator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index 61f768c512..e8c37389d2 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -52,7 +52,7 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
: mIsValid(false)
{
#ifdef LL_WINDOWS // or BOOST_WINDOWS_API
- fs::path dir_path(utf8str_to_utf16str(dirname));
+ fs::path dir_path(ll_convert<std::wstring>(dirname));
#else
fs::path dir_path(dirname);
#endif