diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-16 10:40:50 -0700 |
| commit | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (patch) | |
| tree | fd46ccd3fe330f4bdaf6a5dec368ff2d1195899c /indra/llvfs/lldir.cpp | |
| parent | 020a1b5b8a5aa09e677640491616d846c40a260e (diff) | |
| parent | 35168862f5ecc06166fbd1a9bcd601ae2abbf75b (diff) | |
Merge
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index da4abde451..29b6f490c8 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -91,15 +91,16 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) S32 result; while (getNextFileInDir(dirname, mask, filename, FALSE)) { - if ((filename == ".") || (filename == "..")) + fullpath = dirname; + fullpath += getDirDelimiter(); + fullpath += filename; + + if(LLFile::isdir(fullpath)) { // skipping directory traversal filenames count++; continue; } - fullpath = dirname; - fullpath += getDirDelimiter(); - fullpath += filename; S32 retry_count = 0; while (retry_count < 5) |