diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
| commit | 8153e7d63923a0022ffc1d6f526d4be57d34ba3d (patch) | |
| tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/newview/llwindebug.h | |
| parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
| parent | 19d063952c4706d4344f207775aa5dfdff8802fd (diff) | |
Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
Diffstat (limited to 'indra/newview/llwindebug.h')
| -rw-r--r-- | indra/newview/llwindebug.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h index 7e5818ba1c..524adba652 100644 --- a/indra/newview/llwindebug.h +++ b/indra/newview/llwindebug.h @@ -29,7 +29,11 @@ #include "stdtypes.h" #include "llwin32headerslean.h" + +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include <dbghelp.h> +#pragma warning (pop) class LLWinDebug: public LLSingleton<LLWinDebug> |