diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-02-24 18:41:26 -0500 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-02-24 18:41:26 -0500 |
| commit | ed418397a17573f0bf72991cb8348558e1049f14 (patch) | |
| tree | c147a328e51f1fdfda196b85bef881ce61f21ab4 /indra/llwindow/llwindowwin32.cpp | |
| parent | 6cd2a02c7fbacfd4cf2cf9055e1c282bac3afeb6 (diff) | |
| parent | 44e21aa718211cf34a59a036f2831c2e80fef8e1 (diff) | |
Merge branch 'release/2026.01' into develop
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 9d05d7e5a4..2bd9dd053c 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -436,7 +436,7 @@ struct LLWindowWin32::LLWindowWin32Thread : public LL::ThreadPool { if (!mWindowTimeout) { - mWindowTimeout = std::make_unique<LLWatchdogTimeout>("mainloop"); + mWindowTimeout = std::make_unique<LLWatchdogTimeout>("WindowThread"); // supposed to be executed within run(), // so no point checking if thread is alive resumeTimeout("TimeoutInit"); |