diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:07 -0400 |
| commit | 444311d58082ae1277a3628fbe380f7407910f50 (patch) | |
| tree | 9349d5caf656ac427da037fe6fc4b1f4f387ded1 /indra/newview/lllogchat.cpp | |
| parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) | |
| parent | c492bffaa6cd0d9bb05bbc3671c7658b7ba52862 (diff) | |
pull tags and late fixes back from viewer-pre-release
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) |