diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 12:47:19 -0400 |
| commit | 2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch) | |
| tree | 6d57ab7f0d3ea7717276fca421e98547d52b5124 /indra/newview/lllogchat.cpp | |
| parent | 6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff) | |
| parent | a03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff) | |
merge changes for storm-1130
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) |