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.h | |
parent | 8abd6ed6b8c294ec6bfca59929dbcc71cd65c3a3 (diff) | |
parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) |
merge with viewer-release
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
-rwxr-xr-x | indra/newview/llappviewerwin32.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |