From 0d75c5f4a68df5850dff9afbca545a51459dc040 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 29 Sep 2011 12:57:13 -0500
Subject: [PATCH] Pull Nyx's thread local data initialization fix
---
indra/newview/llappviewer.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2320d4a0d01..eb5ebbf1e91 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -773,6 +773,9 @@ bool LLAppViewer::init()
LLViewerAssetStatsFF::init();
}
+ // init main thread's local data pool before initializing the threads - Nyx
+ LLThreadLocalData::init();
+
initThreads();
LL_INFOS("InitInfo") << "Threads initialized." << LL_ENDL ;
--
GitLab