diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
| commit | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (patch) | |
| tree | 8941117f3f0384be524a8013cdd3b159642ebde1 /indra/newview/llgroupmgr.cpp | |
| parent | 64c07135bab95b5425ddff69351f0c86301def97 (diff) | |
| parent | 781bd2ce1956c32db72ec0d477edc44619f39f05 (diff) | |
merge up from 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 |