diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-06-19 09:58:43 -0700 |
| commit | ea40b3a37b0f9b7e09e999a2c6529905e251ecad (patch) | |
| tree | 9cfb5603040efc7738bca633b902c190db28b0bf /indra/newview/llappviewerwin32.cpp | |
| parent | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merge with viewer 3.6.0
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rwxr-xr-x | indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 0ba3669487..3cf3c739d9 100755 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -490,7 +490,7 @@ bool LLAppViewerWin32::init() // (Don't send our data to Microsoft--at least until we are Logo approved and have a way // of getting the data back from them.) // - llinfos << "Turning off Windows error reporting." << llendl; + // llinfos << "Turning off Windows error reporting." << llendl; disableWinErrorReporting(); #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -509,9 +509,9 @@ bool LLAppViewerWin32::cleanup() return result; } -void LLAppViewerWin32::initLogging() +void LLAppViewerWin32::initLoggingAndGetLastDuration() { - LLAppViewer::initLogging(); + LLAppViewer::initLoggingAndGetLastDuration(); } void LLAppViewerWin32::initConsole() |