diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:26:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-31 12:26:23 -0500 |
| commit | bbb4fb10a50495669ec5d49da4a39950a5e2042d (patch) | |
| tree | 8924813e2b9a356bc1f50ad6db9dccb683c10146 /indra/newview/llappviewer.cpp | |
| parent | 0d5b0cad146d2ce4a24256845b36c4eee847f7ad (diff) | |
| parent | dd859c5e3eee97db614edc94d36b25d138fa9c5c (diff) | |
merge changes for storm-643
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; |