diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-08-18 20:23:06 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-08-18 20:23:06 +0300 |
| commit | 83e7b7a9399ac3f4979d9bb11ea98b9dac77c986 (patch) | |
| tree | be13610335e1715c5fd154c7278711566fbaf3d9 | |
| parent | b2223dfd1c796236504cef600379f9468ed42aed (diff) | |
MAINT-7691 Fixed cache not clearing correctly and incapability to find dump files in case of unicode path
| -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)) |