diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-08-06 18:41:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-06 18:41:52 +0300 |
| commit | 55f1c8b9797836c9816528bb5b772eb83b083b50 (patch) | |
| tree | fdbc5a913c62265f95e610819637e096f0f85339 /indra/llfilesystem | |
| parent | 514b658fde13bb0c0ec862b081eeebf47bace70d (diff) | |
| parent | ce9d66cdd18c58c3b26fbebde633ae00732d7f9f (diff) | |
Merge pull request #4492 Merge Develop into Maint-C (2025.06)
Merge Develop into Maint-C (2025.06)
Diffstat (limited to 'indra/llfilesystem')
| -rw-r--r-- | indra/llfilesystem/lldir.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index 99d4850610..b80243c22e 100644 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -110,9 +110,10 @@ std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname) std::vector<std::string> v; - if (exists(p)) + boost::system::error_code ec; + if (exists(p, ec) && !ec.failed()) { - if (is_directory(p)) + if (is_directory(p, ec) && !ec.failed()) { boost::filesystem::directory_iterator end_iter; for (boost::filesystem::directory_iterator dir_itr(p); |