diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:31:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:31:35 -0500 |
| commit | 781bd2ce1956c32db72ec0d477edc44619f39f05 (patch) | |
| tree | bde52dae7e7fc79ee6cf517fc976ec9f5c188b1d /indra/newview/llgroupmgr.cpp | |
| parent | b1787a19d37b831de5465c0b0f3b7abd42d99afb (diff) | |
| parent | ed73c8bf6357ca1e1a8009ead6b3b664e25c29c9 (diff) | |
sync to latest viewer-development and viewer-autobuild
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 |