diff options
| author | jenn <jenn@lindenlab.com> | 2011-01-25 10:36:14 -0800 |
|---|---|---|
| committer | jenn <jenn@lindenlab.com> | 2011-01-25 10:36:14 -0800 |
| commit | c2d1f9215a5e7902c68a5e71ca7d0d852305ff31 (patch) | |
| tree | 2d5dce0c5c58a5b9ec995a1d0f6fc2790c3b3a19 /indra/newview/lllogchat.cpp | |
| parent | 93138ec2cbd5a9707a7ade1acc6ef35fbc50b422 (diff) | |
| parent | 6dd086794f5cf319fca1736a5803423b58d79d0b (diff) | |
Merge in changes from mani_linden/viewer-vs2010
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) |