summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsingleton.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-03-13 16:41:35 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-03-13 16:41:35 -0400
commitd7f5122ee9e12b5aec14b15517c3a4c0021544ce (patch)
tree78a6f0a74993c707196a015a021b4a8676375659 /indra/llcommon/llsingleton.h
parent66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (diff)
parenta160e084afb336ad88af04c96ceb3f804176c92c (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/llcommon/llsingleton.h')
-rw-r--r--indra/llcommon/llsingleton.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 1b915dfd6e..0d4a1f34f8 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -452,6 +452,14 @@ public:
return sData.mInitState == INITIALIZED;
}
+ // Has this singleton been deleted? This can be useful during shutdown
+ // processing to avoid "resurrecting" a singleton we thought we'd already
+ // cleaned up.
+ static bool wasDeleted()
+ {
+ return sData.mInitState == DELETED;
+ }
+
private:
struct SingletonData
{