diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
| commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
| tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/llvfs/lldir.cpp | |
| parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
| parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index ab7d15dfef..64556bcb4c 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -40,8 +40,6 @@ #include "lltimer.h" // ms_sleep() #include "lluuid.h" -#include "lldiriterator.h" - #if LL_WINDOWS #include "lldir_win32.h" LLDir_Win32 gDirUtil; @@ -85,9 +83,7 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) std::string filename; std::string fullpath; S32 result; - - LLDirIterator iter(dirname, mask); - while (iter.next(filename)) + while (getNextFileInDir(dirname, mask, filename)) { fullpath = dirname; fullpath += getDirDelimiter(); |