summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-31 16:51:41 -0400
committerOz Linden <oz@lindenlab.com>2011-03-31 16:51:41 -0400
commitc5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch)
tree7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/newview/lllogchat.cpp
parentba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff)
parent4047349ade461fa6bac43da2a14c6e7689918aa1 (diff)
pull improved avatar physics ui and other improvements from Seraph
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)