diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
| commit | 1e586749efeeb8c40503330572680a8709ae5487 (patch) | |
| tree | 5c1ebee5dbdb5004f354b9fb0837d60f6dd3cfcc /indra/llvfs/lldiriterator.cpp | |
| parent | 32f16633c77564d567ed0752e56eb38abb916ccd (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
STORM-2145 Merge up to viewer-release
Diffstat (limited to 'indra/llvfs/lldiriterator.cpp')
| -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; |