summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-06-05 06:15:03 -0700
commitdb85ed33e03c81b69ec020f6daf302bc2478163e (patch)
treea2c47fdda14579beabf33a660b7c522076b93f33 /indra/newview/llappviewerwin32.cpp
parent50689a13baf07bcd68bfb77b111b066da972f076 (diff)
parentedf0a0c7f5dcfee2010447bc877515b70d1b1059 (diff)
MErge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rwxr-xr-xindra/newview/llappviewerwin32.cpp4
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()