diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
commit | d020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch) | |
tree | 67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/llcommon/linden_common.h | |
parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
parent | 70600ea66adc816e72e91e804deebde40ed6b1bc (diff) |
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/llcommon/linden_common.h')
-rw-r--r-- | indra/llcommon/linden_common.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 9adf24a492..d0ab5e969f 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -72,13 +72,7 @@ #ifdef LL_WINDOWS // Reenable warnings we disabled above #pragma warning (3 : 4702) // unreachable code, we like level 3, not 4 -// level 4 warnings that we need to disable: -#pragma warning (disable : 4100) // unreferenced formal parameter -#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) ) -#pragma warning (disable : 4244) // possible loss of data on conversions -#pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template -#pragma warning (disable : 4512) // assignment operator could not be generated -#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) +// moved msvc warnings to llpreprocessor.h *TODO - delete this comment after merge conflicts are unlikely -brad #endif // LL_WINDOWS // Linden only libs in alpha-order other than stdtypes.h |