diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-03-12 19:09:06 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-03-12 19:09:06 +0200 |
| commit | 82d018806a79553cc53a91027760eed5282f2d6b (patch) | |
| tree | 06ccac7daa2abbb3ec39ff34c1ce161dfc4e823f /indra/llwindow/llwindowwin32.cpp | |
| parent | 28958ab7ae368d53b21888d178a9eb04ac6d82d2 (diff) | |
| parent | 18db816ef7552785ffa26d6d0397efbb341a999f (diff) | |
Merge branch 'main' into marchcat/slua-26.1
# Conflicts:
# autobuild.xml
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llinventorygallerymenu.cpp
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 252482a96e..8e3d2c9c8e 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -437,7 +437,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"); |