diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-03-07 06:24:50 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-03-07 06:24:50 +0800 |
| commit | 8142dd11b4cae8d4768a2d985a24340163a42a5c (patch) | |
| tree | 488555dc7de288819fec95c7c1ba504a5a26fc71 /indra/llwindow | |
| parent | 35a04b57e5c9b02b661c02a90919c481597a1d10 (diff) | |
| parent | e572093ef7e0ed4c9d94be4ecaae850bcdb73e54 (diff) | |
Merge tag 'Second_Life_Release#e572093e-2026.01' into 2026.012026.01
Diffstat (limited to 'indra/llwindow')
| -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 0335b4b3e3..dbdbfe390f 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"); |
