Merge tag 'Second_Life_Release#3529bc5f-2026.02' into 2026.02

1 files changed, 14 insertions, 0 deletions

diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp
index 82e9e18918..fafe959ac6 100644
--- a/indra/llfilesystem/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
@@ -91,6 +91,8 @@ LLDiskCache::LLDiskCache(const std::string& cache_dir,
 // asset will have to be re-requested.
 void LLDiskCache::purge()
 {
+    LL_PROFILE_ZONE_SCOPED;
+
     if (mEnableCacheDebugInfo)
     {
         LL_INFOS() << "Total dir size before purge is " << dirFileSize(sCacheDir) << LL_ENDL;
@@ -112,6 +114,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 LL_WINDOWS
@@ -158,6 +164,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;
@@ -190,6 +200,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:";