diff options
| -rwxr-xr-x | indra/llfilesystem/lldir.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index d36df99c14..eb3c2d9909 100755 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -30,8 +30,6 @@ #include <sys/stat.h> #include <sys/types.h> #include <errno.h> -#else -#include <direct.h> #endif #include "lldir.h" @@ -43,7 +41,6 @@ #include "lldiriterator.h" #include "stringize.h" #include "llstring.h" -#include <boost/filesystem.hpp> #include <boost/bind.hpp> #include <algorithm> @@ -93,11 +90,11 @@ LLDir::~LLDir() std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname) { - //Returns a vector of fullpath filenames. + // Returns a vector of filenames in the directory. std::filesystem::path p = LLFile::utf8StringToPath(dirname); std::vector<std::string> v; std::error_code ec; - if (std::filesystem::is_directory(p, ec) && !ec) + if (std::filesystem::is_directory(p, ec)) { std::filesystem::directory_iterator end_iter; for (std::filesystem::directory_iterator dir_itr(p); |