diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:38:06 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:38:06 +0300 |
| commit | dbb044e9bb1c3d155ceb6736e2d6c9c1360b4882 (patch) | |
| tree | 2efb419eb53c74142f21a31120d9415b493fee97 /indra/newview/llappviewerwin32.h | |
| parent | 94973e736c5373dc75eb42cd43156193401dcd1b (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview/llappviewerwin32.h')
| -rw-r--r-- | indra/newview/llappviewerwin32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h index 82b6b0c77c..ab52bf15f9 100644 --- a/indra/newview/llappviewerwin32.h +++ b/indra/newview/llappviewerwin32.h @@ -51,8 +51,8 @@ protected: bool initHardwareTest() override; // Win32 uses DX9 to test hardware. bool initParseCommandLine(LLCommandLineParser& clp) override; - virtual bool beingDebugged(); - virtual bool restoreErrorTrap(); + bool beingDebugged() override; + bool restoreErrorTrap() override; bool sendURLToOtherInstance(const std::string& url) override; |