diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llappviewerlinux.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llappviewerlinux.h | 2 | ||||
| -rwxr-xr-x | indra/newview/llappviewerwin32.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llappviewerwin32.h | 2 | 
4 files changed, 6 insertions, 6 deletions
| diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 5f98fd0a34..b16bb573e1 100755 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -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) diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h index b30977acb3..fb77600c10 100755 --- a/indra/newview/llappviewerlinux.h +++ b/indra/newview/llappviewerlinux.h @@ -63,7 +63,7 @@ protected:  	virtual bool restoreErrorTrap();  	virtual void handleCrashReporting(bool reportFreeze); -	virtual void initLogging(); +	virtual void initLoggingAndGetLastDuration();  	virtual bool initParseCommandLine(LLCommandLineParser& clp);  	virtual bool initSLURLHandler(); 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() diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h index d95174dd1d..386bddd495 100755 --- a/indra/newview/llappviewerwin32.h +++ b/indra/newview/llappviewerwin32.h @@ -44,7 +44,7 @@ public:  	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); | 
