diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
| commit | 9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch) | |
| tree | 529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/newview/lllogchat.cpp | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
| parent | 819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff) | |
pull updates to the start of 2.6.2 from 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) |