summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.h
diff options
context:
space:
mode:
authorCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:22:44 -0600
committerCinder Roxley <cinder.roxley@phoenixviewer.com>2013-06-27 21:22:44 -0600
commit7e0bc07e5cd72cfb7c55c964a73d9d8c9e9e5988 (patch)
treee847d23a8642323ef63df22a9426f1524d4da796 /indra/newview/llappviewerwin32.h
parent4f7b8a7e861ee25f1e0f7b0df2e9c8372254f46d (diff)
parent6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
-rwxr-xr-xindra/newview/llappviewerwin32.h2
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);