diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-01 07:22:32 -0500 |
commit | f0074f1002f36ad680ae04daf3f5e026dca31d54 (patch) | |
tree | e55cad847d3dbd156b8386272d0778bdf952c33a /indra/llvfs/lldir.cpp | |
parent | 1aa01ad67fbe15ed43d8bb0bc7fb34a076a484b0 (diff) | |
parent | ed308d15bf2f88f91687411cd92f6cc55b1e75b4 (diff) |
merge changes back from beta branch
Diffstat (limited to 'indra/llvfs/lldir.cpp')
-rw-r--r-- | indra/llvfs/lldir.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 64556bcb4c..cb898e385f 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -101,10 +101,18 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) { if (0 != LLFile::remove(fullpath)) { + retry_count++; result = errno; llwarns << "Problem removing " << fullpath << " - errorcode: " << result << " attempt " << retry_count << llendl; - ms_sleep(1000); + + if(retry_count >= 5) + { + llwarns << "Failed to remove " << fullpath << llendl ; + return count ; + } + + ms_sleep(100); } else { @@ -113,8 +121,7 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) llwarns << "Successfully removed " << fullpath << llendl; } break; - } - retry_count++; + } } count++; } |