diff options
| author | Richard Linden <none@none> | 2010-04-15 12:00:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-04-15 12:00:59 -0700 |
| commit | 8999fe99ffaefcb41ba0aff5057eb67940f959ef (patch) | |
| tree | 69788a05500b2adfd3f575af5d6df645c3ab492e /indra | |
| parent | 59446d550522660c47065622812308da190d6a89 (diff) | |
| parent | ffa71c3486a28118761e2bb0e7d2a03d54a91436 (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra')
| -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 // |