diff options
author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/llvfs | |
parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/llvfs')
-rw-r--r-- | indra/llvfs/lldiriterator.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 76296ff877..3eb64e69d9 100644 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -51,7 +51,11 @@ private: 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)); +#else fs::path dir_path(dirname); +#endif bool is_dir = false; |