diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:15:47 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-13 11:15:47 -0800 |
| commit | 804495ad41cbd0eb511c02d5306fc3b8f9be0b89 (patch) | |
| tree | a4b1f3995878302a9f62dc25e7cdbb2d53f8c3a3 /indra/llvfs/lldir.cpp | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
STORM-477 : backout changeset 6f5cb303d3e2
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(); |