From 88f503ecc34755952c844c45f7366b0065fdfa02 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 26 Apr 2024 23:54:40 +0300 Subject: viewer-private#217 Cef log was deleted too often delete once per session, not once per instance # Conflicts: # indra/newview/llviewermedia.cpp --- indra/newview/llappviewer.cpp | 8 ++++++++ indra/newview/llviewermedia.cpp | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9889765fff..609f003b1d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2354,6 +2354,14 @@ void LLAppViewer::initLoggingAndGetLastDuration() { LL_WARNS("MarkerFile") << duration_log_msg << LL_ENDL; } + + std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.log"); + if (gDirUtilp->fileExists(user_data_path_cef_log)) + { + std::string user_data_path_cef_old = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.old"); + LLFile::remove(user_data_path_cef_old, ENOENT); + LLFile::rename(user_data_path_cef_log, user_data_path_cef_old); + } } } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 17b4a2b35b..5b11e57f14 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1730,14 +1730,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path_cache = gDirUtilp->getCacheDir(false); user_data_path_cache += gDirUtilp->getDirDelimiter(); - std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.log"); - std::string user_data_path_cef_old = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.old"); - if (gDirUtilp->fileExists(user_data_path_cef_log)) - { - LLFile::remove(user_data_path_cef_old, ENOENT); - LLFile::rename(user_data_path_cef_log, user_data_path_cef_old); - } - // See if the plugin executable exists llstat s; if(LLFile::stat(launcher_name, &s)) -- cgit v1.2.3