diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
| commit | 42415ab0cf05cbb1c470ae65a2ab7bed005927dd (patch) | |
| tree | 7bed99ca0b8131d067ed0dea01723f6cb7f2456d /indra/newview/llappviewerwin32.h | |
| parent | 75cf90723f63d1d80b2a3b4b8aa9536cadcda8cb (diff) | |
| parent | 6b2e40157b1f103b8394aeffcce2115321943ebf (diff) | |
Merged in DV546-merge-6.4.24 (pull request #731)
DRTVWR-546 merge up to v 6.4.24
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; |