diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:53:52 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:53:52 -0500 |
| commit | 4497502d0d3784a2cfd6871e7609290de2023475 (patch) | |
| tree | 42e04c6380d13a4653e3649753129e5562989df7 /indra/newview/llgroupmgr.cpp | |
| parent | 893690bb4f9da18d999cc47e51242af7ffb77b8a (diff) | |
| parent | 75f7aca1079468eb8655c5726318cc3a7aa85c16 (diff) | |
Automated merge with file:///Users/oz/Work/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 |