diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
| commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
| tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/llvfs | |
| parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
| parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) | |
Merge
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 924e1166ee..b845de71fa 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -104,8 +104,13 @@ LLDir::~LLDir() std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname) { //Returns a vector of fullpath filenames. - - boost::filesystem::path p (dirname); + +#ifdef LL_WINDOWS // or BOOST_WINDOWS_API + boost::filesystem::path p(utf8str_to_utf16str(dirname)); +#else + boost::filesystem::path p(dirname); +#endif + std::vector<std::string> v; if (exists(p)) @@ -193,7 +198,12 @@ U32 LLDir::deleteDirAndContents(const std::string& dir_name) try { - boost::filesystem::path dir_path(dir_name); +#ifdef LL_WINDOWS // or BOOST_WINDOWS_API + boost::filesystem::path dir_path(utf8str_to_utf16str(dir_name)); +#else + boost::filesystem::path dir_path(dir_name); +#endif + if (boost::filesystem::exists (dir_path)) { if (!boost::filesystem::is_empty (dir_path)) |