diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
| commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
| tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/newview/lllogchat.cpp | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
| parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) | |
merge out 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) |