diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2018-01-12 09:08:49 -0500 |
| commit | 1e586749efeeb8c40503330572680a8709ae5487 (patch) | |
| tree | 5c1ebee5dbdb5004f354b9fb0837d60f6dd3cfcc /indra/llcommon/llregistry.h | |
| parent | 32f16633c77564d567ed0752e56eb38abb916ccd (diff) | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
STORM-2145 Merge up to viewer-release
Diffstat (limited to 'indra/llcommon/llregistry.h')
| -rw-r--r-- | indra/llcommon/llregistry.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h index 29950c108d..750fe9fdc8 100644 --- a/indra/llcommon/llregistry.h +++ b/indra/llcommon/llregistry.h @@ -247,7 +247,10 @@ class LLRegistrySingleton : public LLRegistry<KEY, VALUE, COMPARATOR>, public LLSingleton<DERIVED_TYPE> { - friend class LLSingleton<DERIVED_TYPE>; + // This LLRegistrySingleton doesn't use LLSINGLETON(LLRegistrySingleton) + // because the concrete class is actually DERIVED_TYPE, not + // LLRegistrySingleton. So each concrete subclass needs + // LLSINGLETON(whatever) -- not this intermediate base class. public: typedef LLRegistry<KEY, VALUE, COMPARATOR> registry_t; typedef const KEY& ref_const_key_t; @@ -269,7 +272,7 @@ public: ~ScopedRegistrar() { - if (!singleton_t::destroyed()) + if (singleton_t::instanceExists()) { popScope(); } |