summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorsimon <none@none>2013-04-25 16:21:32 -0700
committersimon <none@none>2013-04-25 16:21:32 -0700
commitb49f6e1e744e7650fbea77e5744343d223e962a3 (patch)
tree25c96fbda3613792322ef926bbfde68b79a1ae11 /indra/llcommon
parent6e483af1f6b7a6f8d0f83e54d79a941607760f7b (diff)
Clean up LLSingleton work - special case to re-create instance if it's been deleted.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llsingleton.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 84afeb563e..550e3c0d20 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -145,7 +145,9 @@ public:
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)
{