diff -r 1d4d568986e3 -r 9a68e6a25b68 indra/newview/llappviewer.cpp --- a/indra/newview/llappviewer.cpp Mon Jun 06 08:50:53 2011 -0400 +++ b/indra/newview/llappviewer.cpp Mon Jun 06 17:40:19 2011 -0400 @@ -3497,7 +3497,7 @@ // Migrate inventory cache to avoid pain to inventory database after mass update S32 file_count = 0; std::string file_name; - std::string mask = delimiter + "*.*"; + std::string mask = "*.*"; LLDirIterator iter(old_cache_dir, mask); while (iter.next(file_name)) @@ -3725,8 +3725,7 @@ { // doesn't exist, look for a data file std::string mask; - mask = gDirUtilp->getDirDelimiter(); - mask += VFS_DATA_FILE_BASE; + mask = VFS_DATA_FILE_BASE; mask += "*"; std::string dir;