diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
| commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
| tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llcommon/linden_common.h | |
| parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff) | |
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llcommon/linden_common.h')
| -rw-r--r-- | indra/llcommon/linden_common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h index 39ee014241..504552a9d2 100644 --- a/indra/llcommon/linden_common.h +++ b/indra/llcommon/linden_common.h @@ -58,6 +58,12 @@ #ifdef LL_WINDOWS #pragma warning (3 : 4702) // 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 : 4512) // assignment operator could not be generated +#pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) #endif // LL_WINDOWS // Linden only libs in alpha-order other than stdtypes.h |