diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:52:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:52:37 -0400 |
| commit | d0ba2bc847b5addf16cf90cea34de5194cd61511 (patch) | |
| tree | a7f80f0c8bb60f497fee8b49b75faa40e0b0ab52 /indra/newview/llgroupmgr.cpp | |
| parent | e23eeb7ed20055e1a95ea87e0014ba141f4ab0bb (diff) | |
| parent | 5e617d77f34f17f7a8f3677270f2738f857a60b8 (diff) | |
pull latest changes from viewer-development
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 |