diff options
| author | Richard Linden <none@none> | 2010-04-15 12:57:02 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-04-15 12:57:02 -0700 |
| commit | fed0e3376f24d3fbd036633a1d6916bef38a2d54 (patch) | |
| tree | a508cc54b0c1db6c75ceaa748ea640dc43aa365d | |
| parent | 0bd41cbf828181ad013964c68ab12d1f00f69bfa (diff) | |
| parent | 8999fe99ffaefcb41ba0aff5057eb67940f959ef (diff) | |
merge
| -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 // |