diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-12-11 01:43:58 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-07 02:15:43 +0200 |
| commit | 9440f969033b73e2e2a037c291bcb45619b1dfd1 (patch) | |
| tree | 086e8f5a66e0adaeeef68400f73ff78ae456b1d2 /indra/llcommon/llerror.cpp | |
| parent | b9727dd84124756adacfbce73b5a916a2c0dd891 (diff) | |
Reapply "Add more functionality to LLFile and cleanup LLAPRFile""
# Conflicts:
# indra/llcrashlogger/llcrashlock.cpp
# indra/llrender/llshadermgr.cpp
# indra/test/CMakeLists.txt
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llerror.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 8ae0fabcc6..5b42c83a14 100644..100755 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -481,13 +481,9 @@ namespace std::string file = user_dir + "/logcontrol-dev.xml"; - llstat stat_info; - if (LLFile::stat(file, &stat_info)) { - // NB: stat returns non-zero if it can't read the file, for example - // if it doesn't exist. LLFile has no better abstraction for - // testing for file existence. - - file = app_dir + "/logcontrol.xml"; + if (!LLFile::isfile(file)) + { + file = app_dir + "/logcontrol.xml"; } return * new LogControlFile(file); // NB: This instance is never freed |