diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
| commit | cfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch) | |
| tree | 1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/llvfs/lldir.cpp | |
| parent | f440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff) | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
Merge
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 341c96f6ea..f3ac17d612 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(); |