summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-10-10 22:32:11 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-10-10 22:38:36 +0300
commitdc2fc3488d8d1ebb2e90520dd17325f08b7c538b (patch)
tree01884fed5eb9ad89911a21ccffa1c6064768ca83 /indra/llwindow
parenteb7ab130003ce1e8f005e3a0d4263987f08759ac (diff)
Revert "SL-18721 Viewer shutdown order changes"
This reverts commit edf0874e0656c6f512df50ee52236209531ca329. Reverted since it causes a significant uptick in shutdown freezes. Can't repro those freezes, will seek an alternate solution.
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llwindowwin32.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 01e38fcc9d..2e560ddb0a 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -828,7 +828,6 @@ void LLWindowWin32::close()
// Is window is already closed?
if (!mWindowHandle)
{
- mWindowThread->close();
return;
}
@@ -4591,7 +4590,7 @@ std::vector<std::string> LLWindowWin32::getDynamicFallbackFontList()
#endif // LL_WINDOWS
inline LLWindowWin32::LLWindowWin32Thread::LLWindowWin32Thread()
- : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE, false)
+ : ThreadPool("Window Thread", 1, MAX_QUEUE_SIZE)
{
ThreadPool::start();
}