diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 17:56:43 -0400 |
| commit | 1108cd0e5c052176f9dacc69b04d702a06b744de (patch) | |
| tree | 21b0be76071d28b165f99f57086ce9a16c79bb34 /indra/newview/llappviewerlinux.cpp | |
| parent | 2268bf38339178f93b317693c0a6808807301d64 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
merge changes for 3.6.0-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) |