diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
| commit | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch) | |
| tree | 4396f7f721befba4f907c0871067e3da1cdf0494 /indra/llxml | |
| parent | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (diff) | |
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llcontrol.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 37939a0908..0864940866 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -56,7 +56,16 @@ #endif #include <boost/bind.hpp> + +#if LL_WINDOWS + #pragma warning (push) + #pragma warning (disable : 4263) // boost::signals2::expired_slot::what() has const mismatch + #pragma warning (disable : 4264) +#endif #include <boost/signals2.hpp> +#if LL_WINDOWS + #pragma warning (pop) +#endif #if LL_WINDOWS # if (_MSC_VER >= 1300 && _MSC_VER < 1400) |