summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-06-06 17:40:19 -0400
committerLogan Dethrow <log@lindenlab.com>2011-06-06 17:40:19 -0400
commit18a2c3c017d8f967425076fb21f11c56d18a732b (patch)
tree442dc9e99200c16f3b4f9dd98c70267d1c8aae3a /indra/newview
parent7a7c6860e523a53285acda408d7798ffcd892778 (diff)
VWR-25965 Fix to two calls to LLDirIterator mask argument.
Removed two cases in llappviewer.cpp where the mask argument to LLDirIterator had a leading delimiter.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 90f46316e8..d2582d524d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3497,7 +3497,7 @@ void LLAppViewer::migrateCacheDirectory()
// 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 @@ bool LLAppViewer::initCache()
{
// 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;