diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
| commit | 038b38c446f18f60916b5c859eea0711f0b420d0 (patch) | |
| tree | b1da90c24a8268dc659979eaee84c63bdc7777f5 /indra/llvfs/lldir.cpp | |
| parent | c020c5c0f3454d4930078651f446e5494d6137b6 (diff) | |
| parent | 4af9db7b79f5721d1be6b8b94dd1e0ce97782d79 (diff) | |
STORM-477 : pull in viewer-development
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 64556bcb4c..ab7d15dfef 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -40,6 +40,8 @@ #include "lltimer.h" // ms_sleep() #include "lluuid.h" +#include "lldiriterator.h" + #if LL_WINDOWS #include "lldir_win32.h" LLDir_Win32 gDirUtil; @@ -83,7 +85,9 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) std::string filename; std::string fullpath; S32 result; - while (getNextFileInDir(dirname, mask, filename)) + + LLDirIterator iter(dirname, mask); + while (iter.next(filename)) { fullpath = dirname; fullpath += getDirDelimiter(); |