diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
| commit | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (patch) | |
| tree | 064c76d04bd762387da065a6662972e8129f509a /indra/newview/llappviewer.cpp | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
| parent | 669cf170ceae2609202fb948d388b7492f8eb90a (diff) | |
merge storm-102 branch back to default
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 60ed37bdfb..8619247980 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3033,7 +3033,7 @@ void LLAppViewer::migrateCacheDirectory() S32 file_count = 0; std::string file_name; std::string mask = delimiter + "*.*"; - while (gDirUtilp->getNextFileInDir(old_cache_dir, mask, file_name, false)) + while (gDirUtilp->getNextFileInDir(old_cache_dir, mask, file_name)) { if (file_name == "." || file_name == "..") continue; std::string source_path = old_cache_dir + delimiter + file_name; @@ -3252,7 +3252,7 @@ bool LLAppViewer::initCache() dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""); std::string found_file; - if (gDirUtilp->getNextFileInDir(dir, mask, found_file, false)) + if (gDirUtilp->getNextFileInDir(dir, mask, found_file)) { old_vfs_data_file = dir + gDirUtilp->getDirDelimiter() + found_file; |