Skip to content
Snippets Groups Projects
Commit edf0a0c7 authored by Oz Linden's avatar Oz Linden
Browse files

fix modified virtual function names in platform-specific modules

parent 2f87c07a
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -63,7 +63,7 @@ class LLAppViewerLinux : public LLAppViewer
virtual bool restoreErrorTrap();
virtual void handleCrashReporting(bool reportFreeze);
virtual void initLogging();
virtual void initLoggingAndGetLastDuration();
virtual bool initParseCommandLine(LLCommandLineParser& clp);
virtual bool initSLURLHandler();
......
......@@ -509,9 +509,9 @@ bool LLAppViewerWin32::cleanup()
return result;
}
void LLAppViewerWin32::initLogging()
void LLAppViewerWin32::initLoggingAndGetLastDuration()
{
LLAppViewer::initLogging();
LLAppViewer::initLoggingAndGetLastDuration();
}
void LLAppViewerWin32::initConsole()
......
......@@ -44,7 +44,7 @@ class LLAppViewerWin32 : public LLAppViewer
virtual bool cleanup();
protected:
virtual void initLogging(); // Override to clean stack_trace info.
virtual void initLoggingAndGetLastDuration(); // Override to clean stack_trace info.
virtual void initConsole(); // Initialize OS level debugging console.
virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
virtual bool initParseCommandLine(LLCommandLineParser& clp);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment