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/newview/llappviewer.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | e213a36f703629dcfe27ed65ac1f66a5a5194b67 (diff) | |
merge changes for storm-477
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9de2941c4a..5033094835 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -89,6 +89,7 @@ // Linden library includes #include "llavatarnamecache.h" +#include "lldiriterator.h" #include "llimagej2c.h" #include "llmemory.h" #include "llprimitive.h" @@ -3432,7 +3433,9 @@ void LLAppViewer::migrateCacheDirectory() S32 file_count = 0; std::string file_name; std::string mask = delimiter + "*.*"; - while (gDirUtilp->getNextFileInDir(old_cache_dir, mask, file_name)) + + LLDirIterator iter(old_cache_dir, mask); + while (iter.next(file_name)) { if (file_name == "." || file_name == "..") continue; std::string source_path = old_cache_dir + delimiter + file_name; @@ -3653,7 +3656,8 @@ bool LLAppViewer::initCache() dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""); std::string found_file; - if (gDirUtilp->getNextFileInDir(dir, mask, found_file)) + LLDirIterator iter(dir, mask); + if (iter.next(found_file)) { old_vfs_data_file = dir + gDirUtilp->getDirDelimiter() + found_file; |