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/integration_tests/llimage_libtest | |
parent | 9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff) | |
parent | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
-rw-r--r-- | indra/integration_tests/llimage_libtest/llimage_libtest.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp index 3d27b4a5b5..f4dba16a94 100644 --- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp +++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp @@ -42,6 +42,7 @@ #include "lldiriterator.h" #include "v4coloru.h" #include "llsdserialize.h" +#include "llcleanup.h" // system libraries #include <iostream> @@ -634,7 +635,7 @@ int main(int argc, char** argv) } // Cleanup and exit - LLImage::cleanupClass(); + SUBSYSTEM_CLEANUP(LLImage); if (fast_timer_log_thread) { fast_timer_log_thread->shutdown(); |