diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-15 14:13:00 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-15 14:13:00 -0700 |
| commit | 4fe28de53a7467809f791790bf889d36c93eaa0b (patch) | |
| tree | e7220f530f1ce817ff092360dd87d83c82794ca8 /indra/newview | |
| parent | 5b64be097f319d7d2f20e0b1fd803a3644544dc3 (diff) | |
| parent | fed0e3376f24d3fbd036633a1d6916bef38a2d54 (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -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 // |