diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-14 16:54:02 -0400 |
| commit | e119b26f03377b32988456d3fc4ed9605649c191 (patch) | |
| tree | 4d8043344bd5a276a0fcdc26eac07ef3c3d51c77 /indra/newview/lllogchat.cpp | |
| parent | 95fcff557f19712e23410a07751f2b571fead8a9 (diff) | |
| parent | 647a270ee22ab38044013c8098babc20b9287ec7 (diff) | |
merged tip of viewer-beta at changeset 9de6fc07304f
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) |