diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-10-13 15:28:53 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-10-13 15:28:53 -0600 |
| commit | e989b79dae7b7128c6ce4580b6731dcd3347b94e (patch) | |
| tree | 72c71a57659a7068f291426cb5235cb68d3436c9 /indra/newview/llappviewerwin32.h | |
| parent | 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-528
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
| -rw-r--r-- | indra/newview/llappviewerwin32.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h index 83ae875a15..82b6b0c77c 100644 --- a/indra/newview/llappviewerwin32.h +++ b/indra/newview/llappviewerwin32.h @@ -51,9 +51,8 @@ protected: bool initHardwareTest() override; // Win32 uses DX9 to test hardware. bool initParseCommandLine(LLCommandLineParser& clp) override; - bool beingDebugged() override; - bool restoreErrorTrap() override; - void initCrashReporting(bool reportFreeze) override; + virtual bool beingDebugged(); + virtual bool restoreErrorTrap(); bool sendURLToOtherInstance(const std::string& url) override; |