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/llviewerdisplay.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) mode change 100644 => 100755 indra/newview/llviewerdisplay.cpp (limited to 'indra/newview/llviewerdisplay.cpp') diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp old mode 100644 new mode 100755 index ce59e844ec..5ad3344a6e --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1139,15 +1139,12 @@ std::string getProfileStatsFilename() // same second), may produce (e.g.) sec==61, but avoids collisions and // preserves chronological filename sort order. std::string name; - std::error_code ec; do { // base + missing 2-digit seconds, append ".json" // post-increment sec in case we have to try again name = stringize(base, std::setw(2), std::setfill('0'), sec++, ".json"); - } while (std::filesystem::exists(fsyspath(name), ec)); - // Ignoring ec means we might potentially return a name that does already - // exist -- but if we can't check its existence, what more can we do? + } while (LLFile::exists(fsyspath(name))); return name; } -- cgit v1.3 From bddb75f1ee729925f1df2f52158e3af64bcac843 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Wed, 17 Dec 2025 10:55:32 +0200 Subject: #4899 Adjustments per rae's review --- indra/llcommon/llfile.cpp | 9 ++++----- indra/newview/llviewerdisplay.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewerdisplay.cpp') diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index ff87d8ce10..3780a26cbe 100755 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -226,7 +226,7 @@ static void find_locking_process(const std::string& filename) } #endif // LL_WINDOWS hack to identify processes holding file open -static int warnif(const std::string& desc, const std::string& filename, int rc, int suppress_warning = 0) +static int warnif(std::string_view desc, const std::string& filename, int rc, int suppress_warning = 0) { if (rc < 0) { @@ -252,7 +252,7 @@ static int warnif(const std::string& desc, const std::string& filename, int rc, return rc; } -static int warnif(const std::string& desc, const std::string& filename, const std::error_code& ec, int suppress_warning = 0) +static int warnif(std::string_view desc, const std::string& filename, const std::error_code& ec, int suppress_warning = 0) { if (ec) { @@ -1130,11 +1130,10 @@ const std::string& LLFile::tmpdir() temppath = std::filesystem::temp_directory_path().string(); } - char sep; #if LL_WINDOWS - sep = '\\'; + char sep = '\\'; #else - sep = '/'; + char sep = '/'; #endif if (temppath[temppath.size() - 1] != sep) { diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 5ad3344a6e..6b1ec4bbbe 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1144,7 +1144,7 @@ std::string getProfileStatsFilename() // base + missing 2-digit seconds, append ".json" // post-increment sec in case we have to try again name = stringize(base, std::setw(2), std::setfill('0'), sec++, ".json"); - } while (LLFile::exists(fsyspath(name))); + } while (LLFile::exists(name)); return name; } -- 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/newview/llviewerdisplay.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