diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 17:27:31 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-07-18 17:27:31 -0400 |
| commit | 1bea6e50aa11f691759c6c30850a3415edaa6383 (patch) | |
| tree | 803fb6c5b2ffcec6296a333fe25a9d0c60abceba /indra/newview/llappviewerlinux.cpp | |
| parent | d6d2159bf875884bb060aaf8234478dd1ec478b4 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merge. Refresh from viewer-release.
Diffstat (limited to 'indra/newview/llappviewerlinux.cpp')
| -rwxr-xr-x | indra/newview/llappviewerlinux.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 5f98fd0a34..b16bb573e1 100755 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -440,7 +440,7 @@ bool LLAppViewerLinux::beingDebugged() #endif } -void LLAppViewerLinux::initLogging() +void LLAppViewerLinux::initLoggingAndGetLastDuration() { // Remove the last stack trace, if any // This file is no longer created, since the move to Google Breakpad @@ -449,7 +449,7 @@ void LLAppViewerLinux::initLogging() gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log"); LLFile::remove(old_stack_file); - LLAppViewer::initLogging(); + LLAppViewer::initLoggingAndGetLastDuration(); } bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp) |