From b49f6e1e744e7650fbea77e5744343d223e962a3 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Thu, 25 Apr 2013 16:21:32 -0700
Subject: [PATCH] Clean up LLSingleton work - special case to re-create
instance if it's been deleted.
---
indra/llcommon/llsingleton.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 84afeb563eb..550e3c0d20d 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -145,7 +145,9 @@ class LLSingleton : private boost::noncopyable
if (data.mInitState == DELETED)
{
llwarns << "Trying to access deleted singleton " << typeid(DERIVED_TYPE).name() << " creating new instance" << llendl;
- }
+ data.mSingletonInstance = new DERIVED_TYPE();
+ data.mInitState = INITIALIZING;
+ } // Fall into INITIALIZING case below
if (data.mInitState == INITIALIZING)
{
--
GitLab