diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/llcommon/linden_common.h | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/llcommon/linden_common.h')
-rw-r--r-- | linden/indra/llcommon/linden_common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h index 01540c1..547cceb 100644 --- a/linden/indra/llcommon/linden_common.h +++ b/linden/indra/llcommon/linden_common.h | |||
@@ -58,6 +58,13 @@ | |||
58 | 58 | ||
59 | #ifdef LL_WINDOWS | 59 | #ifdef LL_WINDOWS |
60 | #pragma warning (3 : 4702) // we like level 3, not 4 | 60 | #pragma warning (3 : 4702) // we like level 3, not 4 |
61 | // level 4 warnings that we need to disable: | ||
62 | #pragma warning (disable : 4100) // unreferenced formal parameter | ||
63 | #pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) ) | ||
64 | #pragma warning (disable : 4244) // possible loss of data on conversions | ||
65 | #pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template | ||
66 | #pragma warning (disable : 4512) // assignment operator could not be generated | ||
67 | #pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) | ||
61 | #endif // LL_WINDOWS | 68 | #endif // LL_WINDOWS |
62 | 69 | ||
63 | // Linden only libs in alpha-order other than stdtypes.h | 70 | // Linden only libs in alpha-order other than stdtypes.h |