diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-13 13:58:40 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-13 13:58:40 -0700 |
| commit | 8a6965a3f94c0e56e0c2b17af329a6ac2c235735 (patch) | |
| tree | efa48644f44a7203c43f9cdbdc6a545108d72626 /indra/llvfs/lldir.cpp | |
| parent | ff3289e2f3a8e87ce33cb267ad30b4a431406f9e (diff) | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
Merge latest from lindenlab/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 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(); |