summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-29 12:57:13 -0500
committerDave Parks <davep@lindenlab.com>2011-09-29 12:57:13 -0500
commit0d75c5f4a68df5850dff9afbca545a51459dc040 (patch)
tree7479da19f6eb6f2754a7fdec128cc43e01f4f55e
parentb8b0886f3e7a421ad5f90cd5454a39f4d2dac959 (diff)
Pull Nyx's thread local data initialization fix
-rw-r--r--indra/newview/llappviewer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2320d4a0d0..eb5ebbf1e9 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 ;