From 7991ae892ef0f717636c0fe3c0eff0a5f92e6bb8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 2 Dec 2025 00:44:56 +0200
Subject: #5084 Ressurect Watchdog

---
 indra/newview/llwatchdog.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llwatchdog.cpp')

diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index bf171fe954..614d1afc2a 100644
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -28,6 +28,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llwatchdog.h"
 #include "llthread.h"
+#include "llappviewer.h"
 
 constexpr U32 WATCHDOG_SLEEP_TIME_USEC = 1000000U;
 
@@ -240,7 +241,16 @@ void LLWatchdog::run()
             {
                 mTimer->stop();
             }
-
+            if (LLAppViewer::instance()->logoutRequestSent())
+            {
+                LLAppViewer::instance()->createErrorMarker(LAST_EXEC_LOGOUT_FROZE);
+            }
+            else
+            {
+                LLAppViewer::instance()->createErrorMarker(LAST_EXEC_FROZE);
+            }
+            // Todo1: warn user?
+            // Todo2: We probably want to report even if 5 seconds passed, just not error 'yet'.
             LL_ERRS() << "Watchdog timer expired; assuming viewer is hung and crashing" << LL_ENDL;
         }
     }
-- 
cgit v1.3