diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 13:52:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 13:52:53 -0500 |
| commit | 7d16a1959005ec7607a787f757a049d744fafb8e (patch) | |
| tree | 0edd3491ba75e4ce537bdc5e544b029b24922e04 /indra/newview/llgroupmgr.cpp | |
| parent | fb94ad7646b5c8a2eaa65e41b0b8b1679652d956 (diff) | |
| parent | b890f3cd55b21c62d2629c82336cd19e2750a760 (diff) | |
merge changes for 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 |