From 9440f969033b73e2e2a037c291bcb45619b1dfd1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Thu, 11 Dec 2025 01:43:58 +0200
Subject: Reapply "Add more functionality to LLFile and cleanup LLAPRFile""

# Conflicts:
#	indra/llcrashlogger/llcrashlock.cpp
#	indra/llrender/llshadermgr.cpp
#	indra/test/CMakeLists.txt
---
 indra/newview/llvocache.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 indra/newview/llvocache.cpp

(limited to 'indra/newview/llvocache.cpp')

diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
old mode 100644
new mode 100755
index 5d456b1a19..cdc41baa88
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -1250,7 +1250,7 @@ void LLVOCache::removeCache(ELLPath location, bool started)
     std::string cache_dir = gDirUtilp->getExpandedFilename(location, object_cache_dirname);
     LL_INFOS() << "Removing cache at " << cache_dir << LL_ENDL;
     gDirUtilp->deleteFilesInDir(cache_dir, mask); //delete all files
-    LLFile::rmdir(cache_dir);
+    LLFile::remove(cache_dir);
 
     clearCacheInMemory();
     mInitialized = false;
@@ -1370,7 +1370,7 @@ void LLVOCache::removeFromCache(HeaderEntryInfo* entry)
     std::string filename;
     getObjectCacheFilename(entry->mHandle, filename);
     LL_WARNS("GLTF", "VOCache") << "Removing object cache for handle " << entry->mHandle << "Filename: " << filename << LL_ENDL;
-    LLAPRFile::remove(filename, mLocalAPRFilePoolp);
+    LLFile::remove(filename);
 
     // Note: `removeFromCache` should take responsibility for cleaning up all cache artefacts specfic to the handle/entry.
     // as such this now includes the generic extras
@@ -1394,7 +1394,7 @@ void LLVOCache::readCacheHeader()
     clearCacheInMemory();
 
     bool success = true ;
-    if (LLAPRFile::isExist(mHeaderFileName, mLocalAPRFilePoolp))
+    if (LLFile::isfile(mHeaderFileName))
     {
         LLAPRFile apr_file(mHeaderFileName, APR_READ|APR_BINARY, mLocalAPRFilePoolp);
 
-- 
cgit v1.3


From 516bd5e832a91e1f837b5b1b621cfac5fe71c08f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:04:26 +0200
Subject: #4899 Fix permissions flags on files that shouldn't be executable #2

---
 indra/llcommon/llfile.cpp             | 0
 indra/llcommon/llfile.h               | 0
 indra/llfilesystem/lldir.cpp          | 0
 indra/llfilesystem/llfilesystem.cpp   | 0
 indra/newview/llappviewer.cpp         | 0
 indra/newview/llfloaterpreference.cpp | 0
 indra/newview/llfloateruipreview.cpp  | 0
 indra/newview/lltexturecache.cpp      | 0
 indra/newview/llvocache.cpp           | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 indra/llcommon/llfile.cpp
 mode change 100755 => 100644 indra/llcommon/llfile.h
 mode change 100755 => 100644 indra/llfilesystem/lldir.cpp
 mode change 100755 => 100644 indra/llfilesystem/llfilesystem.cpp
 mode change 100755 => 100644 indra/newview/llappviewer.cpp
 mode change 100755 => 100644 indra/newview/llfloaterpreference.cpp
 mode change 100755 => 100644 indra/newview/llfloateruipreview.cpp
 mode change 100755 => 100644 indra/newview/lltexturecache.cpp
 mode change 100755 => 100644 indra/newview/llvocache.cpp

(limited to 'indra/newview/llvocache.cpp')

diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
old mode 100755
new mode 100644
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
old mode 100755
new mode 100644
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
old mode 100755
new mode 100644
diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
old mode 100755
new mode 100644
-- 
cgit v1.3