diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
| commit | 14dae8bc8ee55fdd027c7232e3dbcf7b7eedd3cc (patch) | |
| tree | 8d84f9c2a7fb2f859f6bb3b1c0dfacc6319cc01e /indra/newview/llappviewerwin32.h | |
| parent | 11afa09ea3f56c0e20eb195ae1520a88602ceaca (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
SL-16220: Merge branch 'master' into sl-16220
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; |