aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewerwin32.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llappviewerwin32.h')
-rw-r--r--linden/indra/newview/llappviewerwin32.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewerwin32.h b/linden/indra/newview/llappviewerwin32.h
index fe16ec4..3812c43 100644
--- a/linden/indra/newview/llappviewerwin32.h
+++ b/linden/indra/newview/llappviewerwin32.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$ 5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2007-2008, Linden Research, Inc. 7 * Copyright (c) 2007-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -49,15 +49,21 @@ public:
49 virtual bool cleanup(); 49 virtual bool cleanup();
50 50
51protected: 51protected:
52 virtual bool initLogging(); // Override to clean stack_trace info.
52 virtual void initConsole(); // Initialize OS level debugging console. 53 virtual void initConsole(); // Initialize OS level debugging console.
53 virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware. 54 virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
54 virtual bool initParseCommandLine(LLCommandLineParser& clp); 55 virtual bool initParseCommandLine(LLCommandLineParser& clp);
55 56
56 virtual void handleCrashReporting(); 57 virtual bool restoreErrorTrap();
58 virtual void handleCrashReporting(bool reportFreeze);
57 virtual void handleSyncCrashTrace(); 59 virtual void handleSyncCrashTrace();
58 60
61 virtual bool sendURLToOtherInstance(const std::string& url);
62
59 std::string generateSerialNumber(); 63 std::string generateSerialNumber();
60 64
65 static const std::string sWindowClass;
66
61private: 67private:
62 void disableWinErrorReporting(); 68 void disableWinErrorReporting();
63 69