From 6fc355814f3dec7351fd629f4d263c46cfb0e160 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 22 Jan 2013 20:30:05 -0800
Subject: SH-3275 WIP Update viewer metrics system to be more flexible fix for
mac unit tests failing
---
indra/llcommon/llthreadlocalstorage.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llthreadlocalstorage.h b/indra/llcommon/llthreadlocalstorage.h
index fd44589299..4873b2740d 100644
--- a/indra/llcommon/llthreadlocalstorage.h
+++ b/indra/llcommon/llthreadlocalstorage.h
@@ -177,12 +177,14 @@ public:
llwarns << "Trying to access deleted singleton " << typeid(DERIVED_TYPE).name() << " creating new instance" << llendl;
}
+#if LL_DARWIN
+ createTLSInstance();
+#endif
if (!getIfExists())
{
setInitState(CONSTRUCTING);
DERIVED_TYPE* instancep = new DERIVED_TYPE();
#if LL_DARWIN
- createTLSInstance();
S32 result = pthread_setspecific(sInstanceKey, (void*)instancep);
if (result != 0)
{
--
cgit v1.2.3