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/integration_tests/llimage_libtest | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
| parent | 234ea528505d0363c4c4eb0150e7587e863c8e20 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
| -rwxr-xr-x | 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 100755 --- 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(); |