diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
commit | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch) | |
tree | aff6d5b13b69121919433f80103e0594b3525c9d /indra/llcommon/llsingleton.h | |
parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 { |