Merge branch 'main' into gltf_mesh_import

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llfilesystem/lldiriterator.cpp b/indra/llfilesystem/lldiriterator.cpp
index 61f768c512..cd99c79357 100644
--- a/indra/llfilesystem/lldiriterator.cpp
+++ b/indra/llfilesystem/lldiriterator.cpp
@@ -72,7 +72,11 @@ LLDirIterator::Impl::Impl(const std::string &dirname, const std::string &mask)
 
     if (!is_dir)
     {
+#if LL_WINDOWS
+        LL_WARNS() << "Invalid path: \"" << utf16str_to_utf8str(dir_path.wstring()) << "\"" << LL_ENDL;
+#else
         LL_WARNS() << "Invalid path: \"" << dir_path.string() << "\"" << LL_ENDL;
+#endif
         return;
     }
 
@@ -130,7 +134,11 @@ bool LLDirIterator::Impl::next(std::string &fname)
         while (mIter != end_itr && !found)
         {
             boost::smatch match;
+#if LL_WINDOWS
+            std::string name = utf16str_to_utf8str(mIter->path().filename().wstring());
+#else
             std::string name = mIter->path().filename().string();
+#endif
             found = ll_regex_match(name, match, mFilterExp);
             if (found)
             {