diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-11 19:42:26 -0500 |
| commit | 7309fda08c5bd13c1966a4024f193074f0b4a410 (patch) | |
| tree | b7eea9121560e1d13ed41f9dd5946738755da320 /indra/newview/lllogchat.cpp | |
| parent | 4223ab9acf282f52aac2bcf124f4b2912c2fe88e (diff) | |
| parent | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (diff) | |
sync up to latest viewer-development
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 9adf374c71..2df683861a 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -41,6 +41,7 @@ #include <boost/regex/v4/match_results.hpp> #if LL_MSVC +#pragma warning(push) // disable warning about boost::lexical_cast unreachable code // when it fails to parse the string #pragma warning (disable:4702) |