diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-16 15:43:58 -0400 |
| commit | 01e0b78c595e346bef4e771f9580006dd895367c (patch) | |
| tree | 90160c9edb07baa4fcfd022082608f96b1bfdc06 /indra/llvfs | |
| parent | 2368c44a8e2b031e5a8ac199923a016915cfe96a (diff) | |
| parent | cf865bb5962a85e2da3414468d6a99ecb5423f97 (diff) | |
merge changes for DRTVWR-439
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; |