diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 15:03:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 15:03:57 -0400 |
| commit | a160e084afb336ad88af04c96ceb3f804176c92c (patch) | |
| tree | 7aa10603d8aba8d14206c48260cee607ce764789 /indra/llcommon/llsingleton.h | |
| parent | 17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff) | |
| parent | c1458713dea2ac8cec100628c0ca5238fcca93ba (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-maint-7177
Diffstat (limited to 'indra/llcommon/llsingleton.h')
| -rw-r--r-- | indra/llcommon/llsingleton.h | 8 |
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 { |