diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 12:07:03 -0800 |
| commit | 038b38c446f18f60916b5c859eea0711f0b420d0 (patch) | |
| tree | b1da90c24a8268dc659979eaee84c63bdc7777f5 /indra/newview/llappviewer.cpp | |
| parent | c020c5c0f3454d4930078651f446e5494d6137b6 (diff) | |
| parent | 4af9db7b79f5721d1be6b8b94dd1e0ce97782d79 (diff) | |
STORM-477 : pull in viewer-development
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 729f83a2b1..f0711db3bd 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" @@ -3291,7 +3292,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; @@ -3510,7 +3513,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; |