diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:55:02 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 10:55:02 +0100 |
| commit | 42743f8b430e15613ad93d66463a5139aaed84ec (patch) | |
| tree | e67b1a34d2b22b7b8ea3ea9979ae9c4469be56c0 /indra/newview/llviewermessage.cpp | |
| parent | 12dadac44e9d5af8728e7bedab586683b2660cb4 (diff) | |
| parent | 4d1b17842f3b97935ae2baaf96506b00796ecb6a (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f55edd76b0..ab35df1101 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -116,6 +116,11 @@ #include "llnotificationmanager.h" // +#if LL_MSVC +// disable boost::lexical_cast warning +#pragma warning (disable:4702) +#endif + // // Constants // |