diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:56:11 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:56:11 +0100 |
| commit | ae8985fe7087b337996459897b27704650932fd5 (patch) | |
| tree | 2c2bbf291242494b0b4f282bda85067f98ced6d6 /indra/llvfs/lldir.cpp | |
| parent | 42743f8b430e15613ad93d66463a5139aaed84ec (diff) | |
| parent | 960eb2c65fe5618bf977b80a3485a4346d5d85c6 (diff) | |
merge from PE's 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) |