summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-22 20:30:05 -0800
committerRichard Linden <none@none>2013-01-22 20:30:05 -0800
commit6fc355814f3dec7351fd629f4d263c46cfb0e160 (patch)
tree1917c2bd843aeaa8ec6fc43f5f51a26b08788ce2 /indra
parentd290112d6f531bfe72700e85ddf48854cf1ab8d7 (diff)
SH-3275 WIP Update viewer metrics system to be more flexible
fix for mac unit tests failing
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llthreadlocalstorage.h4
1 files changed, 3 insertions, 1 deletions
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)
{