From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- indra/newview/llappviewerwin32.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/newview/llappviewerwin32.h (limited to 'indra/newview/llappviewerwin32.h') diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h old mode 100644 new mode 100755 -- cgit v1.2.3 From e20099155378fd10f7997e36ae8ef150c8c5ad91 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 2 Apr 2013 15:01:25 -0400 Subject: change initLogging virtual functions to void (returns were ignored anyway) --- indra/newview/llappviewerwin32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappviewerwin32.h') diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h index 67594aea48..d95174dd1d 100644 --- a/indra/newview/llappviewerwin32.h +++ b/indra/newview/llappviewerwin32.h @@ -44,7 +44,7 @@ public: virtual bool cleanup(); protected: - virtual bool initLogging(); // Override to clean stack_trace info. + virtual void initLogging(); // 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); -- cgit v1.2.3 From edf0a0c7f5dcfee2010447bc877515b70d1b1059 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 4 Jun 2013 16:26:11 -0400 Subject: fix modified virtual function names in platform-specific modules --- indra/newview/llappviewerwin32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappviewerwin32.h') 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); -- cgit v1.2.3