diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:52:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:52:45 -0400 |
| commit | a1741be7f6e4d67be55d6a5bc628c38390f9d4b4 (patch) | |
| tree | 5c02bd701c5e55cfcf9fbe8af34cb2ae4b2c9995 /indra/llcommon/llregistry.h | |
| parent | 9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff) | |
| parent | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff) | |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llcommon/llregistry.h')
| -rw-r--r-- | indra/llcommon/llregistry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h index 29950c108d..fde729f8f9 100644 --- a/indra/llcommon/llregistry.h +++ b/indra/llcommon/llregistry.h @@ -269,7 +269,7 @@ public: ~ScopedRegistrar() { - if (!singleton_t::destroyed()) + if (singleton_t::instanceExists()) { popScope(); } |