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/llxml/tests/llcontrol_test.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 indra/llxml/tests/llcontrol_test.cpp

(limited to 'indra/llxml/tests/llcontrol_test.cpp')

diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
old mode 100644
new mode 100755
index 4192e029c5..e15117fc29
--- a/indra/llxml/tests/llcontrol_test.cpp
+++ b/indra/llxml/tests/llcontrol_test.cpp
@@ -69,7 +69,7 @@ namespace tut
                 LLFile::remove(filename);
             }
             LLFile::remove(mTestConfigFile);
-            LLFile::rmdir(mTestConfigDir);
+            LLFile::remove(mTestConfigDir);
         }
         void writeSettingsFile(const LLSD& config)
         {
-- 
cgit v1.3


From b74a3c25d16685b8dfad8880e20ac99c5769d2e4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Mon, 5 Jan 2026 22:33:33 +0200
Subject: #4899 Fix permissions flags on files that shouldn't be executable

---
 indra/llcommon/llerror.cpp                     | 0
 indra/llfilesystem/lldir_win32.cpp             | 0
 indra/llfilesystem/tests/lldir_test.cpp        | 0
 indra/llmessage/tests/llmessageconfig_test.cpp | 0
 indra/llmessage/tests/message_test.cpp         | 0
 indra/llxml/tests/llcontrol_test.cpp           | 0
 indra/newview/llpreviewnotecard.cpp            | 0
 indra/newview/llpreviewscript.cpp              | 0
 indra/newview/llviewerdisplay.cpp              | 0
 indra/newview/llviewermedia.cpp                | 0
 indra/newview/llvoicevivox.cpp                 | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 indra/llcommon/llerror.cpp
 mode change 100755 => 100644 indra/llfilesystem/lldir_win32.cpp
 mode change 100755 => 100644 indra/llfilesystem/tests/lldir_test.cpp
 mode change 100755 => 100644 indra/llmessage/tests/llmessageconfig_test.cpp
 mode change 100755 => 100644 indra/llmessage/tests/message_test.cpp
 mode change 100755 => 100644 indra/llxml/tests/llcontrol_test.cpp
 mode change 100755 => 100644 indra/newview/llpreviewnotecard.cpp
 mode change 100755 => 100644 indra/newview/llpreviewscript.cpp
 mode change 100755 => 100644 indra/newview/llviewerdisplay.cpp
 mode change 100755 => 100644 indra/newview/llviewermedia.cpp
 mode change 100755 => 100644 indra/newview/llvoicevivox.cpp

(limited to 'indra/llxml/tests/llcontrol_test.cpp')

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
old mode 100755
new mode 100644
diff --git a/indra/llfilesystem/lldir_win32.cpp b/indra/llfilesystem/lldir_win32.cpp
old mode 100755
new mode 100644
diff --git a/indra/llfilesystem/tests/lldir_test.cpp b/indra/llfilesystem/tests/lldir_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/llmessageconfig_test.cpp b/indra/llmessage/tests/llmessageconfig_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llmessage/tests/message_test.cpp b/indra/llmessage/tests/message_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
old mode 100755
new mode 100644
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
old mode 100755
new mode 100644
-- 
cgit v1.3