diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 14:06:06 -0700 |
| commit | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (patch) | |
| tree | 6f99d83a2b2bf3de810dd5a1191a47f7cc53ac9d /indra/newview/llappviewerlinux.cpp | |
| parent | f1e594feceb8ab284e023e164d5410cd53a656cb (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Pull merge from lindenlab/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) |