diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
commit | c5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch) | |
tree | 7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/newview/llgroupmgr.cpp | |
parent | ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff) | |
parent | 4047349ade461fa6bac43da2a14c6e7689918aa1 (diff) |
pull improved avatar physics ui and other improvements from Seraph
Diffstat (limited to 'indra/newview/llgroupmgr.cpp')
-rw-r--r-- | indra/newview/llgroupmgr.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7546c070ea..ce936a9924 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -52,6 +52,7 @@ #include <boost/regex.hpp> #if LL_MSVC +#pragma warning(push) // disable boost::lexical_cast warning #pragma warning (disable:4702) #endif |