From 7a40e2702f7d2a81e674f66f637261a09de5b9ca Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Wed, 20 May 2026 12:45:31 -0400 Subject: Update llappviewer.cpp --- indra/newview/llappviewer.cpp | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 11e6767980..79752d2315 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4207,27 +4207,6 @@ void LLAppViewer::processMarkerFiles() } } else - { - // so only check watchdog marker if there is no error marker. - if (LLAPRFile::isExist(watchdog_marker_file, NULL, LL_APR_RB)) - { - if (LAST_EXEC_UNKNOWN == gLastExecEvent - || LAST_EXEC_LOGOUT_UNKNOWN == gLastExecEvent) - { - // watchdog marker gets created if we detect a freeze, - // so if viwer did not stop gracefully, and we know it wasn't a crash, - // we have no other info, check watchdog. - if (markerIsSameVersion(watchdog_marker_file)) - { - gLastExecEvent = LAST_EXEC_UNKNOWN == gLastExecEvent ? LAST_EXEC_FROZE : LAST_EXEC_LOGOUT_FROZE; - LL_INFOS("MarkerFile") << "Watchdog marker '" << watchdog_marker_file << "' found, setting LastExecEvent to FROZE" - << LL_ENDL; - } - } - removeWatchdogMarker(); - } - } - else { if (LAST_EXEC_UNKNOWN == gLastExecEvent || LAST_EXEC_LOGOUT_UNKNOWN == gLastExecEvent) -- cgit v1.3