diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 15:50:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 15:50:34 -0400 |
| commit | 635a4524fafe754f38432fce2206f8c730df5234 (patch) | |
| tree | 9f35128e70179a25cf086b994d2b4395ff5a2122 /indra/newview/lllogchat.cpp | |
| parent | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff) | |
| parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
pull tags from 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) |