diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:42 -0400 |
| commit | df55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch) | |
| tree | c8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/llcommon/llregistry.h | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
| parent | 234ea528505d0363c4c4eb0150e7587e863c8e20 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llregistry.h')
| -rwxr-xr-x | 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 100755 --- 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(); } |