diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
| commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
| tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/newview/lllogchat.cpp | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) | |
merge out 2.6.0 changes 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) |