diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:35:08 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:35:08 +0300 |
| commit | fb170ffe2102f7245037a8b1eeb39db7ec8d5820 (patch) | |
| tree | 0687368ffd56c450f490b317f21ef9a4a0197a67 /indra/newview/llappviewerwin32.h | |
| parent | 1e7fd6302aa39f1a011e2e4d711bca7a88a62076 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-545-maint-mix
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; |