diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llcommon/llapp.cpp | |
parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llcommon/llapp.cpp')
-rw-r--r-- | indra/llcommon/llapp.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index a8b7106078..ed192a9975 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -137,6 +137,10 @@ void LLApp::commonCtor() mOptions.append(sd); } + // Make sure we clean up APR when we exit + // Don't need to do this if we're cleaning up APR in the destructor + //atexit(ll_cleanup_apr); + // Set the application to this instance. sApplication = this; |