diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 21:18:15 -0500 |
| commit | c20eb01ff2adfc23b83d1d5c8723962f794fdbf4 (patch) | |
| tree | eec524d10d41ec5184a34e78df5aab6180db75c4 /indra/newview/lllogchat.cpp | |
| parent | a8b9392fd83c9fcd2261e76a135d451ae5b90e9b (diff) | |
| parent | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (diff) | |
pull up changes from viewer-autobuild
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) |