4 files changed, 80 insertions, 11 deletions

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index c6d8db8d48..bc3f09c1e5 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -44,6 +44,7 @@
 #include "stringize.h"
 #include "llstring.h"
 #include <boost/filesystem.hpp>
+#include "llprocess.h"
 #include <boost/bind.hpp>
 #include <algorithm>
 
@@ -1104,6 +1105,61 @@ LLDir::SepOff LLDir::needSep(const std::string& path, const std::string& name) c
     return SepOff(false, 0);
 }
 
+void LLDir::openDir(const std::string& filepath)
+{
+    if (filepath.empty())
+    {
+        LL_WARNS() << "Cannot open file browser: filepath is empty" << LL_ENDL;
+        return;
+    }
+
+    // Extract directory path from full filepath
+    std::string dir_path = getDirName(filepath);
+
+    LLProcess::Params params;
+
+#if LL_WINDOWS
+    // Windows: Use explorer.exe with /select flag to highlight the file
+    std::string system_root = LLStringUtil::getenv("SystemRoot");
+    if (system_root.empty())
+    {
+        system_root = LLStringUtil::getenv("WINDIR");
+    }
+    if (system_root.empty())
+    {
+        LL_WARNS() << "Neither SystemRoot nor WINDIR environment variable is set" << LL_ENDL;
+        system_root = "C:\\Windows"; // Last resort fallback
+    }
+    params.executable = system_root + "\\explorer.exe";
+    params.args.add("/select,");
+    params.args.add(filepath);
+#elif LL_DARWIN
+    // macOS: Use 'open' command with -R flag to reveal in Finder
+    params.executable = "/usr/bin/open";
+    params.args.add("-R");
+    params.args.add(filepath);
+#elif LL_LINUX
+    // Linux: Use xdg-open to open the directory
+    // Note: Most file managers don't support file selection, so we open the directory
+    params.executable = "/usr/bin/xdg-open";
+    params.args.add(dir_path);
+#else
+    LL_WARNS() << "Platform not supported for file browser opening" << LL_ENDL;
+    return;
+#endif
+
+    params.autokill = false; // Don't kill the file browser when viewer exits
+
+    if (!LLProcess::create(params))
+    {
+        LL_WARNS() << "Failed to open file browser for: " << filepath << LL_ENDL;
+    }
+    else
+    {
+        LL_INFOS() << "Opened file browser for: " << filepath << LL_ENDL;
+    }
+}
+
 void dir_exists_or_crash(const std::string &dir_name)
 {
 #if LL_WINDOWS
diff --git a/indra/llfilesystem/lldir.h b/indra/llfilesystem/lldir.h
index b0d2b6aada..3c8e2e2da6 100644
--- a/indra/llfilesystem/lldir.h
+++ b/indra/llfilesystem/lldir.h
@@ -194,6 +194,9 @@ class LLDir
 
     virtual void dumpCurrentDirectories(LLError::ELevel level = LLError::LEVEL_DEBUG);
 
+    // Open the system file browser to reveal a file or directory
+    void openDir(const std::string& filepath);
+
     // Utility routine
     std::string buildSLOSCacheDir() const;
 
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:";
diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp
index 541266af4f..728ff396ef 100644
--- a/indra/llfilesystem/llfilesystem.cpp
+++ b/indra/llfilesystem/llfilesystem.cpp
@@ -77,11 +77,10 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
     LL_PROFILE_ZONE_SCOPED;
     const std::string filename = LLDiskCache::metaDataToFilepath(file_id, file_type);
 
-    llifstream file(filename, std::ios::binary);
-    if (file.is_open())
+    boost::system::error_code ec;
+    if (boost::filesystem::exists(filename, ec) && boost::filesystem::is_regular_file(filename, ec))
     {
-        file.seekg(0, std::ios::end);
-        return file.tellg() > 0;
+        return boost::filesystem::file_size(filename, ec) > 0;
     }
     return false;
 }
@@ -120,15 +119,12 @@ S32 LLFileSystem::getFileSize(const LLUUID& file_id, const LLAssetType::EType fi
 {
     const std::string filename = LLDiskCache::metaDataToFilepath(file_id, file_type);
 
-    S32 file_size = 0;
-    llifstream file(filename, std::ios::binary);
-    if (file.is_open())
+    boost::system::error_code ec;
+    if (boost::filesystem::exists(filename, ec) && boost::filesystem::is_regular_file(filename, ec))
     {
-        file.seekg(0, std::ios::end);
-        file_size = (S32)file.tellg();
+        return static_cast<S32>(boost::filesystem::file_size(filename, ec));
     }
-
-    return file_size;
+    return 0;
 }
 
 bool LLFileSystem::read(U8* buffer, S32 bytes)