diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-16 11:04:12 -0400 |
commit | 099e3b41668a8c951cf74ec585ed4192bab507db (patch) | |
tree | 5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/llcommon/llapp.cpp | |
parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
parent | d2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llapp.cpp')
-rw-r--r-- | indra/llcommon/llapp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index eb0699ad41..2c76f29020 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -48,6 +48,7 @@ #include "lleventtimer.h" #include "google_breakpad/exception_handler.h" #include "stringize.h" +#include "llcleanup.h" // // Signal handling @@ -177,7 +178,7 @@ LLApp::~LLApp() if(mExceptionHandler != 0) delete mExceptionHandler; - LLCommon::cleanupClass(); + SUBSYSTEM_CLEANUP(LLCommon); } // static |