diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
| commit | e8810421252c6ff89d00b9a18fa6f118b4b5ac64 (patch) | |
| tree | 0fa3705b3d2d4284c0caa02d198a028fedbbdadc /indra/llvfs/lldir.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | e213a36f703629dcfe27ed65ac1f66a5a5194b67 (diff) | |
merge changes for storm-477
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(); |