Merge pull request #4915 from RyeMutt/rye/linux64-2

Linux64 Part 2

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index e971e1885a..c75df16b7d 100644
--- a/indra/llfilesystem/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
@@ -112,6 +112,10 @@ void LLDiskCache::purge()
         boost::filesystem::directory_iterator iter(cache_path, ec);
         while (iter != boost::filesystem::directory_iterator() && !ec.failed())
         {
+            if(!LLApp::isRunning())
+            {
+                return;
+            }
             if (boost::filesystem::is_regular_file(*iter, ec) && !ec.failed())
             {
                 if ((*iter).path().string().find(CACHE_FILENAME_PREFIX) != std::string::npos)
@@ -150,6 +154,10 @@ void LLDiskCache::purge()
     uintmax_t file_size_total = 0;
     for (file_info_t& entry : file_info)
     {
+        if (!LLApp::isRunning())
+        {
+            return;
+        }
         file_size_total += entry.second.first;
 
         bool should_remove = file_size_total > mMaxSizeBytes;
@@ -176,6 +184,10 @@ void LLDiskCache::purge()
         // Logging thousands of file results can take hundreds of milliseconds
         for (size_t i = 0; i < file_info.size(); ++i)
         {
+            if (!LLApp::isRunning())
+            {
+                return;
+            }
             const file_info_t& entry = file_info[i];
             const bool removed = file_removed[i];
             const std::string action = removed ? "DELETE:" : "KEEP:";