summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-04-07 22:35:27 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-04-07 22:35:27 -0400
commit746633c6adfcde5b43ac578bede09bf7d05934e1 (patch)
tree49d9182789c9cf805969b3779408df55cb1e84b4 /indra/newview/lllogchat.cpp
parent94aa24a89ee96689633fad4e7250f6f81b6b76c1 (diff)
parent7054aaba6d6f044cd835e79e3be898d63ce96def (diff)
Merged BuildParams
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r--indra/newview/lllogchat.cpp1
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)