From a4e53da0b0d8f227865303a785d3d65848cd4ade Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 26 Apr 2013 16:14:44 -0700
Subject: SH-4080 WIP interesting: random crash on Mac fixed Mac crash related
 to non-reentrant singleton constructor

---
 indra/llcommon/llsingleton.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 165344ed19..829c7e4192 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -176,7 +176,7 @@ public:
 	// Use this to avoid accessing singletons before the can safely be constructed
 	static bool instanceExists()
 	{
-		return sReentrantConstructorGuard || getSingletonData().mInitState == INITIALIZED;
+		return !sReentrantConstructorGuard && getSingletonData().mInitState == INITIALIZED;
 	}
 	
 	// Has this singleton already been deleted?
-- 
cgit v1.2.3