diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 06:15:03 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-05 06:15:03 -0700 |
commit | db85ed33e03c81b69ec020f6daf302bc2478163e (patch) | |
tree | a2c47fdda14579beabf33a660b7c522076b93f33 /indra/newview/llappviewerwin32.cpp | |
parent | 50689a13baf07bcd68bfb77b111b066da972f076 (diff) | |
parent | edf0a0c7f5dcfee2010447bc877515b70d1b1059 (diff) |
MErge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rwxr-xr-x | indra/newview/llappviewerwin32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 2a7656ae0a..3cf3c739d9 100755 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -509,9 +509,9 @@ bool LLAppViewerWin32::cleanup() return result; } -void LLAppViewerWin32::initLogging() +void LLAppViewerWin32::initLoggingAndGetLastDuration() { - LLAppViewer::initLogging(); + LLAppViewer::initLoggingAndGetLastDuration(); } void LLAppViewerWin32::initConsole() |