diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 11:24:55 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-16 11:24:55 +0100 |
| commit | 2f19ad5957f0f802395612adce81d7fe02f1b885 (patch) | |
| tree | f9dfc4f5722142cd84e612d2372e04c2a111dd44 /indra/newview/llviewermessage.cpp | |
| parent | 230314ac71a055458d9bff4fae744b8e25f7ada2 (diff) | |
| parent | 05116bac35403e6d8f593b7f057602afa057396d (diff) | |
merge from viewer-trunk
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 0cd69d892f..832a6283ab 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 // |