diff options
| author | McCabe Maxsted | 2009-11-10 13:58:38 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-10 13:58:38 -0700 |
| commit | 25b13a129b1617a8d3036213472b1c34122a5e7e (patch) | |
| tree | 0f35b94bd42a753544cdf420ab70230b15013e8c /linden/indra/llcommon | |
| parent | Fixed llstartup header issue and removed WIN32_LEAN_AND_MEAN define (diff) | |
| download | meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.zip meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.gz meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.bz2 meta-impy-25b13a129b1617a8d3036213472b1c34122a5e7e.tar.xz | |
Viewer compiles, but still trying to get everything to link on Windows
Diffstat (limited to 'linden/indra/llcommon')
| -rw-r--r-- | linden/indra/llcommon/linden_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h index f9d5877..25dd629 100644 --- a/linden/indra/llcommon/linden_common.h +++ b/linden/indra/llcommon/linden_common.h | |||
| @@ -75,6 +75,7 @@ | |||
| 75 | #pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template | 75 | #pragma warning (disable : 4396) // the inline specifier cannot be used when a friend declaration refers to a specialization of a function template |
| 76 | #pragma warning (disable : 4512) // assignment operator could not be generated | 76 | #pragma warning (disable : 4512) // assignment operator could not be generated |
| 77 | #pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) | 77 | #pragma warning (disable : 4706) // assignment within conditional (even if((x = y)) ) |
| 78 | #pragma warning (disable : 4265) // boost 1.36.0, non-virtual destructor in boost::exception_detail::* | ||
| 78 | #endif // LL_WINDOWS | 79 | #endif // LL_WINDOWS |
| 79 | 80 | ||
| 80 | // Linden only libs in alpha-order other than stdtypes.h | 81 | // Linden only libs in alpha-order other than stdtypes.h |