diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-08-16 19:31:16 -0400 |
| commit | 5ae117aff6bfbc3c07876146ca270129dd91a047 (patch) | |
| tree | 462f491cc055aa296b9da0041a322cd9512c045b /indra/newview/llappviewerwin32.cpp | |
| parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
merge with viewer-release
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() |