diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-28 21:23:35 -0700 |
| commit | 125e216603e949ac97e4d8b649390f7c41a743c0 (patch) | |
| tree | 4a7bfd367fd436738b13bfa6946137b300568a02 /indra/newview/llappviewer.cpp | |
| parent | b4b3f78c455a614d7738c29cdc6383e857d6028d (diff) | |
| parent | 948afb8ef436f661dd84e3c343e22934f92570ec (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6a9dfaf21b..69333ff4a3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1296,7 +1296,7 @@ bool LLAppViewer::mainLoop() resumeMainloopTimeout(); pingMainloopTimeout("Main:End"); - } + } } catch(std::bad_alloc) { @@ -1779,6 +1779,8 @@ bool LLAppViewer::cleanup() ll_close_fail_log(); + MEM_TRACK_RELEASE + llinfos << "Goodbye!" << llendflush; // return 0; |