diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2011-04-29 14:23:27 -0700 |
| commit | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (patch) | |
| tree | 42d83ed5f5d34edf99c4b302d9d6744a33e5098f /indra/newview/lllogchat.cpp | |
| parent | 26f2762b89705a69e831016ea67af9500907721d (diff) | |
| parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
Merged with viewer-development.
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
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) |