diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-28 14:03:26 +0100 |
| commit | a254ca8b442e0a17e7048b792fbba48c8db592ee (patch) | |
| tree | 44d591046709d7b8331ab3e8657019326b14cdfe /indra/llvfs | |
| parent | e27efe894740c0c3c959115524ac49db9615262a (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge
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; |