diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 11:24:55 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 11:24:55 +0100 |
| commit | 2f19ad5957f0f802395612adce81d7fe02f1b885 (patch) | |
| tree | f9dfc4f5722142cd84e612d2372e04c2a111dd44 /indra/llvfs/lldir.cpp | |
| parent | 230314ac71a055458d9bff4fae744b8e25f7ada2 (diff) | |
| parent | 05116bac35403e6d8f593b7f057602afa057396d (diff) | |
merge from viewer-trunk
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) |