diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-20 07:36:16 -0400 |
commit | 1e34cd77f7858f0a79d82d405be76837aa2af04e (patch) | |
tree | 40530bc9ab88fca0fcee1c4bce02d2020a1a6b1e /indra/newview/llgroupmgr.cpp | |
parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) | |
parent | 6d3cf2bba29d3134b4ec151df3a8ca92e3506c6b (diff) |
pull STORM-1089 beta fixes to autobuild2010 branch
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 |